filter/qa/cppunit/xslt-test.cxx | 28 +++--- filter/source/config/cache/basecontainer.cxx | 2 filter/source/config/cache/contenthandlerfactory.cxx | 2 filter/source/config/cache/filtercache.cxx | 6 - filter/source/config/cache/filterfactory.cxx | 2 filter/source/config/cache/frameloaderfactory.cxx | 2 filter/source/msfilter/mstoolbar.cxx | 6 - filter/source/msfilter/svdfppt.cxx | 10 +- filter/source/pdf/pdfexport.cxx | 8 - filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 10 +- filter/source/xsltdialog/xmlfilterjar.cxx | 2 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 6 - vcl/jsdialog/executor.cxx | 84 +++++++------------ 13 files changed, 73 insertions(+), 95 deletions(-)
New commits: commit 1b928e0f21a21d03de38acf40c3aea50f3a59a88 Author: Noel Grandin <[email protected]> AuthorDate: Tue May 3 18:35:58 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed May 4 14:10:22 2022 +0200 reduce string conversions in jsdialog::ExecuteAction Change-Id: Id1b908e06ebaa7f6ba5981abff51584623770215 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133814 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 4a75f2a99f71..58ec87cf0197 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -8,6 +8,7 @@ */ #include <jsdialog/jsdialogbuilder.hxx> +#include <o3tl/string_view.hxx> #include <vcl/weld.hxx> #include <vcl/jsdialog/executor.hxx> #include <sal/log.hxx> @@ -81,8 +82,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { if (sAction == "selecttab") { - OString pageId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int page = std::atoi(pageId.getStr()); + sal_Int32 page = o3tl::toInt32(rData["data"]); pNotebook->set_current_page(page); @@ -97,12 +97,12 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { if (sAction == "selected") { - int separatorPos = rData["data"].indexOf(';'); + OUString sSelectedData = rData["data"]; + int separatorPos = sSelectedData.indexOf(';'); if (separatorPos > 0) { - std::u16string_view entryPos = rData["data"].subView(0, separatorPos); - OString posString = OUStringToOString(entryPos, RTL_TEXTENCODING_ASCII_US); - int pos = std::atoi(posString.getStr()); + std::u16string_view entryPos = sSelectedData.subView(0, separatorPos); + sal_Int32 pos = o3tl::toInt32(entryPos); pCombobox->set_active(pos); LOKTrigger::trigger_changed(*pCombobox); return true; @@ -174,18 +174,17 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { if (sAction == "click") { - int separatorPos = rData["data"].indexOf(';'); + OUString sClickData = rData["data"]; + int separatorPos = sClickData.indexOf(';'); if (separatorPos > 0) { // x;y - OString clickPosX = OUStringToOString( - rData["data"].subView(0, separatorPos), RTL_TEXTENCODING_ASCII_US); - OString clickPosY = OUStringToOString( - rData["data"].subView(separatorPos + 1), RTL_TEXTENCODING_ASCII_US); - if (!clickPosX.isEmpty() && !clickPosY.isEmpty()) + std::u16string_view clickPosX = sClickData.subView(0, separatorPos); + std::u16string_view clickPosY = sClickData.subView(separatorPos + 1); + if (!clickPosX.empty() && !clickPosY.empty()) { - double posX = std::atof(clickPosX.getStr()); - double posY = std::atof(clickPosY.getStr()); + double posX = o3tl::toDouble(clickPosX); + double posY = o3tl::toDouble(clickPosY); OutputDevice& rRefDevice = pArea->get_ref_device(); // We send OutPutSize for the drawing area bitmap // get_size_request is not necessarily updated @@ -202,31 +201,27 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "keypress") { - LOKTrigger::trigger_key_press( - *pArea, - KeyEvent(rData["data"].toUInt32(), vcl::KeyCode(rData["data"].toUInt32()))); - LOKTrigger::trigger_key_release( - *pArea, - KeyEvent(rData["data"].toUInt32(), vcl::KeyCode(rData["data"].toUInt32()))); + sal_uInt32 nKeyNo = rData["data"].toUInt32(); + LOKTrigger::trigger_key_press(*pArea, KeyEvent(nKeyNo, vcl::KeyCode(nKeyNo))); + LOKTrigger::trigger_key_release(*pArea, KeyEvent(nKeyNo, vcl::KeyCode(nKeyNo))); return true; } else if (sAction == "textselection") { // start;end - int nSeparatorPos = rData["data"].indexOf(';'); + OUString sTextData = rData["data"]; + int nSeparatorPos = sTextData.indexOf(';'); if (nSeparatorPos <= 0) return true; - std::u16string_view aStartPos = rData["data"].subView(0, nSeparatorPos); - std::u16string_view aEndPos = rData["data"].subView(nSeparatorPos + 1); + std::u16string_view aStartPos = sTextData.subView(0, nSeparatorPos); + std::u16string_view aEndPos = sTextData.subView(nSeparatorPos + 1); if (aStartPos.empty() || aEndPos.empty()) return true; - int nStart = std::atoi( - OUStringToOString(aStartPos.data(), RTL_TEXTENCODING_ASCII_US).getStr()); - int nEnd = std::atoi( - OUStringToOString(aEndPos.data(), RTL_TEXTENCODING_ASCII_US).getStr()); + sal_Int32 nStart = o3tl::toInt32(aStartPos); + sal_Int32 nEnd = o3tl::toInt32(aEndPos); Point aPos(nStart, nEnd); CommandEvent aCEvt(aPos, CommandEventId::CursorPos); @@ -246,8 +241,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM if (rData["data"] == "undefined") return true; - OString sValue = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - double nValue = std::atof(sValue.getStr()); + double nValue = o3tl::toDouble(rData["data"]); pSpinField->set_value(nValue * weld::SpinButton::Power10(pSpinField->get_digits())); LOKTrigger::trigger_value_changed(*pSpinField); @@ -323,8 +317,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM StringMap aMap(jsonToStringMap( OUStringToOString(sDataJSON, RTL_TEXTENCODING_ASCII_US).getStr())); - OString nRowString = OUStringToOString(aMap["row"], RTL_TEXTENCODING_ASCII_US); - int nRow = std::atoi(nRowString.getStr()); + sal_Int32 nRow = o3tl::toInt32(aMap["row"]); bool bValue = aMap["value"] == "true"; pTreeView->set_toggle(nRow, bValue ? TRISTATE_TRUE : TRISTATE_FALSE); @@ -333,13 +326,10 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "select") { - OString nRowString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + sal_Int32 nAbsPos = o3tl::toInt32(rData["data"]); pTreeView->unselect_all(); - int nAbsPos = std::atoi(nRowString.getStr()); - std::unique_ptr<weld::TreeIter> itEntry(pTreeView->make_iterator()); pTreeView->get_iter_abs_pos(*itEntry, nAbsPos); pTreeView->select(*itEntry); @@ -349,9 +339,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "activate") { - OString nRowString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nRow = std::atoi(nRowString.getStr()); + sal_Int32 nRow = o3tl::toInt32(rData["data"]); pTreeView->unselect_all(); pTreeView->select(nRow); @@ -362,9 +350,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "expand") { - OString nRowString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nAbsPos = std::atoi(nRowString.getStr()); + sal_Int32 nAbsPos = o3tl::toInt32(rData["data"]); std::unique_ptr<weld::TreeIter> itEntry(pTreeView->make_iterator()); pTreeView->get_iter_abs_pos(*itEntry, nAbsPos); pTreeView->expand_row(*itEntry); @@ -372,9 +358,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "dragstart") { - OString nRowString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nRow = std::atoi(nRowString.getStr()); + sal_Int32 nRow = o3tl::toInt32(rData["data"]); pTreeView->select(nRow); pTreeView->drag_start(); @@ -395,9 +379,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { if (sAction == "select") { - OString nPosString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nPos = std::atoi(nPosString.getStr()); + sal_Int32 nPos = o3tl::toInt32(rData["data"]); pIconView->select(nPos); LOKTrigger::trigger_changed(*pIconView); @@ -406,9 +388,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "activate") { - OString nPosString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nPos = std::atoi(nPosString.getStr()); + sal_Int32 nPos = o3tl::toInt32(rData["data"]); pIconView->select(nPos); LOKTrigger::trigger_changed(*pIconView); @@ -442,9 +422,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "response") { - OString nResponseString - = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - int nResponse = std::atoi(nResponseString.getStr()); + sal_Int32 nResponse = o3tl::toInt32(rData["data"]); pDialog->response(nResponse); return true; } commit cc264e8ee744aa2802edcac124e37b0cdc398778 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed May 4 11:59:57 2022 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed May 4 14:09:58 2022 +0200 Just use Any ctor instead of makeAny in filter Change-Id: I68bbbc2cc80ac5efde78e10706b488bf78c058bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133816 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx index de0e9e71f07a..4e0c621d6786 100644 --- a/filter/qa/cppunit/xslt-test.cxx +++ b/filter/qa/cppunit/xslt-test.cxx @@ -98,14 +98,14 @@ void XsltFilterTest::testXsltCopyNew() m_directories.getURLFromSrc(u"/filter/source/xsltfilter/xsltfilter.component")); uno::Sequence<uno::Any> args{ uno::Any(beans::NamedValue("StylesheetURL", - uno::makeAny(m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/xslt/copy.xslt")))), - uno::Any(beans::NamedValue("SourceURL", uno::makeAny(source))), - uno::Any(beans::NamedValue("TargetURL", uno::makeAny(tempURL))), + uno::Any(m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/xslt/copy.xslt")))), + uno::Any(beans::NamedValue("SourceURL", uno::Any(source))), + uno::Any(beans::NamedValue("TargetURL", uno::Any(tempURL))), uno::Any(beans::NamedValue("SourceBaseURL", - uno::makeAny(m_directories.getURLFromSrc(u"/filter/source/xsltfilter/")))), - uno::Any(beans::NamedValue("TargetBaseURL", uno::makeAny(tempDirURL))), - uno::Any(beans::NamedValue("SystemType", uno::makeAny(OUString()))), - uno::Any(beans::NamedValue("PublicType", uno::makeAny(OUString()))) + uno::Any(m_directories.getURLFromSrc(u"/filter/source/xsltfilter/")))), + uno::Any(beans::NamedValue("TargetBaseURL", uno::Any(tempDirURL))), + uno::Any(beans::NamedValue("SystemType", uno::Any(OUString()))), + uno::Any(beans::NamedValue("PublicType", uno::Any(OUString()))) }; uno::Reference<ucb::XSimpleFileAccess3> xSFA = @@ -153,14 +153,14 @@ void XsltFilterTest::testXsltCopyOld() m_directories.getURLFromSrc(u"/filter/source/xsltfilter/xsltfilter.component")); uno::Sequence<uno::Any> args{ uno::Any(beans::NamedValue("StylesheetURL", - uno::makeAny(m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/xslt/copy.xslt")))), - uno::Any(beans::NamedValue("SourceURL", uno::makeAny(source))), - uno::Any(beans::NamedValue("TargetURL", uno::makeAny(tempURL))), + uno::Any(m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/xslt/copy.xslt")))), + uno::Any(beans::NamedValue("SourceURL", uno::Any(source))), + uno::Any(beans::NamedValue("TargetURL", uno::Any(tempURL))), uno::Any(beans::NamedValue("SourceBaseURL", - uno::makeAny(m_directories.getURLFromSrc(u"/filter/source/xsltfilter/")))), - uno::Any(beans::NamedValue("TargetBaseURL", uno::makeAny(tempDirURL))), - uno::Any(beans::NamedValue("SystemType", uno::makeAny(OUString()))), - uno::Any(beans::NamedValue("PublicType", uno::makeAny(OUString()))) + uno::Any(m_directories.getURLFromSrc(u"/filter/source/xsltfilter/")))), + uno::Any(beans::NamedValue("TargetBaseURL", uno::Any(tempDirURL))), + uno::Any(beans::NamedValue("SystemType", uno::Any(OUString()))), + uno::Any(beans::NamedValue("PublicType", uno::Any(OUString()))) }; uno::Reference<ucb::XSimpleFileAccess3> xSFA = diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 97e7b7f22bea..c288e88cd2c7 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -430,7 +430,7 @@ void SAL_CALL BaseContainer::flush() throw css::lang::WrappedTargetRuntimeException( "Flush rejected by internal container.", static_cast< OWeakObject* >(this), - css::uno::makeAny(ex)); + css::uno::Any(ex)); } m_pFlushCache.reset(); diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 864911798dfd..7e2ec4fc23cc 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -75,7 +75,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea aHandler >> lConfig; ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector< css::uno::Any > >(lArguments)); - stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); + stlArguments.insert(stlArguments.begin(), css::uno::Any(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); } diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 7d64e645b668..052a7d566eee 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -623,7 +623,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN CacheItemList::const_iterator pItem = rCache.find(item); impl_saveItem(xItem, eType, pItem->second); - xAddRemoveSet->insertByName(item, css::uno::makeAny(xItem)); + xAddRemoveSet->insertByName(item, css::uno::Any(xItem)); } break; @@ -890,14 +890,14 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess // set root path aParam.Name = "nodepath"; aParam.Value <<= sRoot; - lParams.push_back(css::uno::makeAny(aParam)); + lParams.push_back(css::uno::Any(aParam)); // enable "all locales mode" ... if required if (bLocalesMode) { aParam.Name = "locale"; aParam.Value <<= OUString("*"); - lParams.push_back(css::uno::makeAny(aParam)); + lParams.push_back(css::uno::Any(aParam)); } // open it diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index c22e3bb03830..33d1b44ae4b2 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -103,7 +103,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan aFilter >> lConfig; ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector< css::uno::Any > >(lArguments)); - stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); + stlArguments.insert(stlArguments.begin(), css::uno::Any(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); } diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 3627ea93faa1..af03dbec96f2 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -73,7 +73,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI aLoader >> lConfig; ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector<css::uno::Any> >(lArguments)); - stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); + stlArguments.insert(stlArguments.begin(), css::uno::Any(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); } diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 339b54766101..f746ad0e8a2d 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -102,7 +102,7 @@ CustomToolBarImportHelper::createCommandFromMacro( std::u16string_view sCmd ) // create script url OUString scriptURL = OUString::Concat("vnd.sun.star.script:") + sCmd + "?language=Basic&location=document"; - return uno::makeAny( scriptURL ); + return uno::Any( scriptURL ); } OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd ) @@ -132,7 +132,7 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW ); // set name for menubar - xProps->setPropertyValue("UIName", uno::makeAny( rName ) ); + xProps->setPropertyValue("UIName", uno::Any( rName ) ); if ( xPopup.is() ) { uno::Sequence< beans::PropertyValue > aPopupMenu{ @@ -142,7 +142,7 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen comphelper::makePropertyValue("Type", sal_Int32( 0 )) }; - xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) ); + xPopup->insertByIndex( xPopup->getCount(), uno::Any( aPopupMenu ) ); xCfgManager->insertSettings( sMenuBar, xPopup ); uno::Reference< ui::XUIConfigurationPersistence > xPersistence( xCfgManager, uno::UNO_QUERY_THROW ); xPersistence->store(); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 4595e0dd5e5e..1c1cf439b999 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7402,7 +7402,7 @@ static void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const { eFS = css::drawing::FillStyle_SOLID; Color aFillColor( pObj->GetMergedItem( XATTR_FILLCOLOR ).GetColorValue() ); - xPropSet->setPropertyValue( "FillColor", makeAny( aFillColor ) ); + xPropSet->setPropertyValue( "FillColor", Any( aFillColor ) ); } break; case drawing::FillStyle_GRADIENT : @@ -7435,16 +7435,16 @@ static void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const const XFillBitmapItem & rXFillBitmapItem(pObj->GetMergedItem( XATTR_FILLBITMAP )); uno::Reference<graphic::XGraphic> xGraphic = rXFillBitmapItem.GetGraphicObject().GetGraphic().GetXGraphic(); uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY); - xPropSet->setPropertyValue("FillBitmap", uno::makeAny(xBitmap)); + xPropSet->setPropertyValue("FillBitmap", uno::Any(xBitmap)); const XFillBmpStretchItem & rStretchItem(pObj->GetMergedItem( XATTR_FILLBMP_STRETCH )); const XFillBmpTileItem & rTileItem(pObj->GetMergedItem( XATTR_FILLBMP_TILE )); if( rTileItem.GetValue() ) - xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_REPEAT)); + xPropSet->setPropertyValue("FillBitmapMode", uno::Any(drawing::BitmapMode_REPEAT)); else if( rStretchItem.GetValue() ) - xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_STRETCH)); + xPropSet->setPropertyValue("FillBitmapMode", uno::Any(drawing::BitmapMode_STRETCH)); else - xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_NO_REPEAT)); + xPropSet->setPropertyValue("FillBitmapMode", uno::Any(drawing::BitmapMode_NO_REPEAT)); } break; default: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 9b07ae1a9306..e2c072a146b7 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -946,14 +946,14 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& xViewProperties->getPropertyValue( sShowOnlineLayout ) >>= bReChangeToNormalView; if( bReChangeToNormalView ) { - xViewProperties->setPropertyValue( sShowOnlineLayout, uno::makeAny( false ) ); + xViewProperties->setPropertyValue( sShowOnlineLayout, uno::Any( false ) ); } // Also, disable hide-whitespace during export. xViewProperties->getPropertyValue(sHideWhitespace) >>= bReHideWhitespace; if (bReHideWhitespace) { - xViewProperties->setPropertyValue(sHideWhitespace, uno::makeAny(false)); + xViewProperties->setPropertyValue(sHideWhitespace, uno::Any(false)); } } catch( const uno::Exception& ) @@ -1016,7 +1016,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { try { - xViewProperties->setPropertyValue( sShowOnlineLayout, uno::makeAny( true ) ); + xViewProperties->setPropertyValue( sShowOnlineLayout, uno::Any( true ) ); } catch( const uno::Exception& ) { @@ -1026,7 +1026,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { try { - xViewProperties->setPropertyValue( sHideWhitespace, uno::makeAny( true ) ); + xViewProperties->setPropertyValue( sHideWhitespace, uno::Any( true ) ); } catch( const uno::Exception& ) { diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index c4fb3eef20cd..f31907519890 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -91,7 +91,7 @@ bool XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); - xInfoSet->setPropertyValue( "BaseURI", makeAny( aBaseURI )); + xInfoSet->setPropertyValue( "BaseURI", Any( aBaseURI )); OUString aFilterName; auto It = aMediaMap.find(OUString("FilterName")); @@ -101,7 +101,7 @@ bool XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& PropertyValue EmptyDbFieldHidesPara("EmptyDbFieldHidesPara", 0, Any(false), PropertyState::PropertyState_DIRECT_VALUE); Sequence<PropertyValue> aSettings{ EmptyDbFieldHidesPara }; - xInfoSet->setPropertyValue("DefaultDocumentSettings", makeAny(aSettings)); + xInfoSet->setPropertyValue("DefaultDocumentSettings", Any(aSettings)); } Sequence< Any > aAnys{ Any(xInfoSet) }; @@ -290,11 +290,11 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); - xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint )); + xInfoSet->setPropertyValue("UsePrettyPrinting", Any( bPrettyPrint )); xInfoSet->setPropertyValue( "ExportTextNumberElement", - makeAny( bExportTextNumberElementForListItems )); - xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI )); + Any( bExportTextNumberElementForListItems )); + xInfoSet->setPropertyValue("BaseURI", Any( aBaseURI )); Sequence < Any > aAnys{ Any(xConverter), Any(xInfoSet) }; Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 23b2510bb49f..2366aa80e825 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -109,7 +109,7 @@ static void addFile_( Reference< XInterface > const & xRootFolder, Reference< XS if( xSink.is() && xTunnel.is()) { Reference< XNameContainer > xNameContainer(xRootFolder, UNO_QUERY ); - xNameContainer->insertByName(encodeZipUri( aName ), makeAny(xTunnel)); + xNameContainer->insertByName(encodeZipUri( aName ), Any(xTunnel)); xSink->setInputStream( xInput ); } } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 705262d0a46e..62a8513d72c3 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -514,7 +514,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi // 4. insert new or replace existing filter try { - Any aAny( makeAny( aFilterData ) ); + Any aAny( aFilterData ); if( mxFilterContainer->hasByName( pFilterEntry->maFilterName ) ) { mxFilterContainer->replaceByName( pFilterEntry->maFilterName, aAny ); @@ -567,7 +567,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi { try { - Any aAny( makeAny( aValues ) ); + Any aAny( aValues ); if( mxTypeDetection->hasByName( pFilterEntry->maType ) ) { mxTypeDetection->replaceByName( pFilterEntry->maType, aAny ); @@ -677,7 +677,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi aSequenceRange[nIndex].Value <<= aTypes; - mxExtendedTypeDetection->replaceByName( sFilterDetectService, makeAny( aSequence ) ); + mxExtendedTypeDetection->replaceByName( sFilterDetectService, Any( aSequence ) ); Reference< XFlushable > xFlushable( mxExtendedTypeDetection, UNO_QUERY ); if( xFlushable.is() )
