diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 23:21:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 06:54:23 +0200 |
| commit | 0bfa6a180850898ec5038ad70e09a2ff7baafa1a (patch) | |
| tree | 616bad3d3714b562da478768455cdb3797da63ba /sfx2 | |
| parent | b34f6f3b5ae6b889fbfd84719ee255282cb45e0e (diff) | |
Just use Any ctor instead of makeAny in sfx2
Change-Id: Ie707881d6f4cd4a2f92f4f5a89aa9e0b051db8a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133783
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
49 files changed, 225 insertions, 225 deletions
diff --git a/sfx2/qa/cppunit/test_classification.cxx b/sfx2/qa/cppunit/test_classification.cxx index c086d2e973cb..45d2947882f3 100644 --- a/sfx2/qa/cppunit/test_classification.cxx +++ b/sfx2/qa/cppunit/test_classification.cxx @@ -62,8 +62,8 @@ void ClassificationTest::testClassification() { uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Non-Business"))}, - {"Type", uno::makeAny(OUString("urn:bails:ExportControl:"))}, + {"Name", uno::Any(OUString("Non-Business"))}, + {"Type", uno::Any(OUString("urn:bails:ExportControl:"))}, })); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); @@ -76,8 +76,8 @@ void ClassificationTest::testClassification() aPropertyValues = comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Confidential"))}, - {"Type", uno::makeAny(OUString("urn:bails:NationalSecurity:"))}, + {"Name", uno::Any(OUString("Confidential"))}, + {"Type", uno::Any(OUString("urn:bails:NationalSecurity:"))}, }); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); aAny = xPropertySet->getPropertyValue("urn:bails:NationalSecurity:BusinessAuthorizationCategory:Identifier"); @@ -85,8 +85,8 @@ void ClassificationTest::testClassification() aPropertyValues = comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Internal Only"))}, - {"Type", uno::makeAny(OUString("urn:bails:IntellectualProperty:"))}, + {"Name", uno::Any(OUString("Internal Only"))}, + {"Type", uno::Any(OUString("urn:bails:IntellectualProperty:"))}, }); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); aAny = xPropertySet->getPropertyValue("urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier"); diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index bbf137a5a09d..95ab7e927b09 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -114,7 +114,7 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testNoThumbnail) utl::TempFile aTempFile; aTempFile.EnableKillingFile(); uno::Sequence<beans::PropertyValue> aProperties( - comphelper::InitPropertySequence({ { "NoThumbnail", uno::makeAny(true) } })); + comphelper::InitPropertySequence({ { "NoThumbnail", uno::Any(true) } })); osl::File::remove(aTempFile.GetURL()); xStorable->storeToURL(aTempFile.GetURL(), aProperties); uno::Reference<packages::zip::XZipFileAccess2> xZipFile @@ -206,13 +206,13 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testOverwrite) // explicitly overwrite the file using the Overwrite option CPPUNIT_ASSERT_NO_THROW(xStorable->storeToURL( aTempFile.GetURL(), - comphelper::InitPropertySequence({ { "Overwrite", uno::makeAny(true) } }))); + comphelper::InitPropertySequence({ { "Overwrite", uno::Any(true) } }))); try { // overwrite an existing file with the Overwrite flag set to false xStorable->storeToURL(aTempFile.GetURL(), comphelper::InitPropertySequence( - { { "Overwrite", uno::makeAny(false) } })); + { { "Overwrite", uno::Any(false) } })); CPPUNIT_ASSERT_MESSAGE("We expect an exception on overwriting an existing file", false); } catch (const css::uno::Exception&) diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index d72369dfb772..819d7037824f 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -120,7 +120,7 @@ void SfxAppData_Impl::OnApplicationBasicManagerCreated( BasicManager& _rBasicMan // global constants, additionally to the ones already added by createApplicationBasicManager: // ThisComponent Reference< XInterface > xCurrentComponent = SfxObjectShell::GetCurrentComponent(); - _rBasicManager.SetGlobalUNOConstant( "ThisComponent", makeAny( xCurrentComponent ) ); + _rBasicManager.SetGlobalUNOConstant( "ThisComponent", css::uno::Any( xCurrentComponent ) ); #endif } diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index caf18f5157ad..1c854b9d9424 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -258,7 +258,7 @@ ErrCode CheckPasswd_Impl if ( aEncryptionData.hasElements() ) { - pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); + pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); try { @@ -694,7 +694,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pHandler->setHandler(xWrappedHandler); else pHandler->useDefaultUUIHandler(); - rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHandler)) ); + rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::Any(xHandler)) ); // define rules for this handler css::uno::Type aInteraction = ::cppu::UnoType<css::task::ErrorCodeRequest>::get(); @@ -989,7 +989,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if (!pInteractionItem) { Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), nullptr ); - rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) ); + rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::Any(xHdl)) ); } if (!pMacroExecItem) rReq.AppendItem( SfxUInt16Item(SID_MACROEXECMODE,css::document::MacroExecMode::USE_CONFIG) ); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 85316c6cf2de..66ac22ee133a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -223,8 +223,8 @@ static void showDocument( const char* pBaseName ) try { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); auto args(::comphelper::InitPropertySequence({ - {"ViewOnly", makeAny(true)}, - {"ReadOnly", makeAny(true)} + {"ViewOnly", Any(true)}, + {"ReadOnly", Any(true)} })); OUString aURL; @@ -763,7 +763,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } // Save new toolbar mode for a current module - aAppNode.setNodeValue( "Active", makeAny( aNewName ) ); + aAppNode.setNodeValue( "Active", Any( aNewName ) ); aAppNode.commit(); } @@ -930,7 +930,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( aCommandArg == aCurrentMode ) { - aModeNode.setNodeValue( "UserToolbars", makeAny( aBackup ) ); + aModeNode.setNodeValue( "UserToolbars", Any( aBackup ) ); break; } } @@ -1059,7 +1059,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if (aAppNode.isValid()) { bool isLocked = comphelper::getBOOL(aAppNode.getNodeValue("Locked")); - aAppNode.setNodeValue("Locked", makeAny(!isLocked)); + aAppNode.setNodeValue("Locked", Any(!isLocked)); aAppNode.commit(); //TODO: apply immediately w/o restart needed SolarMutexGuard aGuard; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index a3c3a6ae1f73..8fb4fa8f6a01 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -292,7 +292,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); css::uno::Sequence < css::beans::NamedValue > aSeq - { { "Data", css::uno::makeAny(aWinData) } }; + { { "Data", css::uno::Any(aWinData) } }; aWinOpt.SetUserData( aSeq ); // ... but save status at runtime! diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 11464dceb64a..18aea4a590a6 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -426,7 +426,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState ) if( !bStateChangeCalled && HasDataLinks() ) { DataChanged( SotExchange::GetFormatName( - sfx2::LinkManager::RegisterStatusInfoId()), css::uno::makeAny(OUString::number( nState )) ); + sfx2::LinkManager::RegisterStatusInfoId()), css::uno::Any(OUString::number( nState )) ); bStateChangeCalled = true; } } diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 3f8fb33636ad..fff7fc140450 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -275,7 +275,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval, if ( bSetGlobalThisComponent ) { // document is executed via AppBASIC, adjust ThisComponent variable - aOldThisComponent = pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pDoc->GetModel() ) ); + aOldThisComponent = pAppMgr->SetGlobalUNOConstant( "ThisComponent", Any( pDoc->GetModel() ) ); } // just to let the shell be alive diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index ecba5be38f3a..8618126e0b5f 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -969,7 +969,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() INetURLObject::EncodeMechanism::All )); } - Any aUserItem = makeAny( aUserData.makeStringAndClear() ); + Any aUserItem( aUserData.makeStringAndClear() ); aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); m_xSearchED.reset(); @@ -1831,9 +1831,9 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl, Timer *, void) { // create descriptor, set string and find all words Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor(); - xSrchDesc->setPropertyValue( "SearchRegularExpression", makeAny( true ) ); + xSrchDesc->setPropertyValue( "SearchRegularExpression", Any( true ) ); if ( bIsFullWordSearch ) - xSrchDesc->setPropertyValue( "SearchWords", makeAny( true ) ); + xSrchDesc->setPropertyValue( "SearchWords", Any( true ) ); xSrchDesc->setSearchString( sfx2::PrepareSearchString( aSearchText, GetBreakIterator(), false ) ); Reference< XIndexAccess > xSelection = xSearchable->findAll( xSrchDesc ); @@ -1882,9 +1882,9 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) { // create descriptor, set string and find all words Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor(); - xSrchDesc->setPropertyValue( "SearchWords", makeAny(pDlg->IsOnlyWholeWords()) ); - xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny(pDlg->IsMarchCase()) ); - xSrchDesc->setPropertyValue( "SearchBackwards", makeAny(pDlg->IsSearchBackwards()) ); + xSrchDesc->setPropertyValue( "SearchWords", Any(pDlg->IsOnlyWholeWords()) ); + xSrchDesc->setPropertyValue( "SearchCaseSensitive", Any(pDlg->IsMarchCase()) ); + xSrchDesc->setPropertyValue( "SearchBackwards", Any(pDlg->IsSearchBackwards()) ); xSrchDesc->setSearchString( pDlg->GetSearchText() ); Reference< XInterface > xSelection; Reference< XTextRange > xCursor = getCursor(); @@ -1956,7 +1956,7 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, CheckHdl, weld::Toggleable&, void) try { ConfigurationHelper::writeRelativeKey( - xConfiguration, PATH_OFFICE_FACTORIES + sCurrentFactory, KEY_HELP_ON_OPEN, makeAny( bChecked ) ); + xConfiguration, PATH_OFFICE_FACTORIES + sCurrentFactory, KEY_HELP_ON_OPEN, Any( bChecked ) ); ConfigurationHelper::flush( xConfiguration ); } catch( Exception const & ) @@ -2156,7 +2156,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const if ( xContainer->getByName( sStyleName ) >>= xStyle ) { Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); - xPropSet->setPropertyValue( "HeaderIsOn", makeAny( false ) ); + xPropSet->setPropertyValue( "HeaderIsOn", Any( false ) ); Reference< XModifiable > xReset(xStyles, UNO_QUERY); xReset->setModified(false); @@ -2297,7 +2297,7 @@ void SfxHelpWindow_Impl::SaveConfig() + ";" + OUString::number( aWinPos.X() ) + ";" + OUString::number( aWinPos.Y() ); - aViewOpt.SetUserItem( USERITEM_NAME, makeAny( aUserData ) ); + aViewOpt.SetUserItem( USERITEM_NAME, Any( aUserData ) ); } void SfxHelpWindow_Impl::ShowStartPage() @@ -2392,13 +2392,13 @@ void SfxHelpWindow_Impl::openDone(std::u16string_view sURL , Reference < XViewSettingsSupplier > xSettings( xController, UNO_QUERY ); Reference < XPropertySet > xViewProps = xSettings->getViewSettings(); Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo(); - xViewProps->setPropertyValue( "ShowContentTips", makeAny( false ) ); - xViewProps->setPropertyValue( "ShowGraphics", makeAny( true ) ); - xViewProps->setPropertyValue( "ShowTables", makeAny( true ) ); - xViewProps->setPropertyValue( "HelpURL", makeAny( OUString("HID:SFX2_HID_HELP_ONHELP") ) ); + xViewProps->setPropertyValue( "ShowContentTips", Any( false ) ); + xViewProps->setPropertyValue( "ShowGraphics", Any( true ) ); + xViewProps->setPropertyValue( "ShowTables", Any( true ) ); + xViewProps->setPropertyValue( "HelpURL", Any( OUString("HID:SFX2_HID_HELP_ONHELP") ) ); OUString sProperty( "IsExecuteHyperlinks" ); if ( xInfo->hasPropertyByName( sProperty ) ) - xViewProps->setPropertyValue( sProperty, makeAny( true ) ); + xViewProps->setPropertyValue( sProperty, Any( true ) ); xController->restoreViewData(Any()); } } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index d941fc2992e4..4aa13c6f2c64 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -560,7 +560,7 @@ static SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , if (xProps.is()) xProps->setPropertyValue( "Title", - makeAny(SfxResId(STR_HELP_WINDOW_TITLE))); + Any(SfxResId(STR_HELP_WINDOW_TITLE))); pHelpWindow->setContainerWindow( xParentWindow ); xParentWindow->setVisible(true); diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 942109db2699..4b1e38a78aca 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -418,7 +418,7 @@ ErrCode SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std: // If there is no acceptable type for this document at all, the type detection has possibly returned something else. // The DocumentService property is only a preselection, and all preselections are considered as optional! // This "wrong" type will be sorted out now because we match only allowed filters to the detected type - uno::Sequence< beans::NamedValue > lQuery { { "Name", css::uno::makeAny(sTypeName) } }; + uno::Sequence< beans::NamedValue > lQuery { { "Name", css::uno::Any(sTypeName) } }; pNewFilter = GetFilterForProps(lQuery, nMust, nDont); } @@ -618,7 +618,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4Mime( const OUStrin return nullptr; } - css::uno::Sequence < css::beans::NamedValue > aSeq { { "MediaType", css::uno::makeAny(rMediaType) } }; + css::uno::Sequence < css::beans::NamedValue > aSeq { { "MediaType", css::uno::Any(rMediaType) } }; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -644,7 +644,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4EA( const OUString& return nullptr; } - css::uno::Sequence < css::beans::NamedValue > aSeq { { "Name", css::uno::makeAny(rType) } }; + css::uno::Sequence < css::beans::NamedValue > aSeq { { "Name", css::uno::Any(rType) } }; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -680,7 +680,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4Extension( const OU sExt = sExt.copy(1); css::uno::Sequence < css::beans::NamedValue > aSeq - { { "Extensions", css::uno::makeAny(uno::Sequence < OUString > { sExt } ) } }; + { { "Extensions", css::uno::Any(uno::Sequence < OUString > { sExt } ) } }; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -690,7 +690,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcher::GetFilter4ClipBoardId( SotCli return nullptr; css::uno::Sequence < css::beans::NamedValue > aSeq - { { "ClipboardFormat", css::uno::makeAny(SotExchange::GetFormatName( nId )) } }; + { { "ClipboardFormat", css::uno::Any(SotExchange::GetFormatName( nId )) } }; return GetFilterForProps( aSeq, nMust, nDont ); } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 362d2d3c6961..0604f035bcd9 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialogController, OKHdl_Impl, weld::Button&, void) OUString sConfigId = OStringToOUString(m_xSfxPage->GetConfigId(), RTL_TEXTENCODING_UTF8); SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); - aPageOpt.SetUserItem( USERITEM_NAME, makeAny( sData ) ); + aPageOpt.SetUserItem( USERITEM_NAME, Any( sData ) ); m_xDialog->response(RET_OK); } else diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 0ac32e343d09..21d2c333f203 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -915,7 +915,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet ) OUString aImagePreferredDPIString = m_xImagePreferredDpiComboBox->get_active_text(); nImagePreferredDPI = aImagePreferredDPIString.toInt32(); } - xProps->setPropertyValue("ImagePreferredDPI", uno::makeAny(nImagePreferredDPI)); + xProps->setPropertyValue("ImagePreferredDPI", uno::Any(nImagePreferredDPI)); } } } diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 8e48a4a12f9d..e7c0348b548f 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -97,11 +97,11 @@ bool SfxDocumentFontsPage::FillItemSet( SfxItemSet* ) { uno::Reference< lang::XMultiServiceFactory > xFac( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY_THROW ); - xProps->setPropertyValue("EmbedFonts", uno::makeAny(bEmbedFonts)); - xProps->setPropertyValue("EmbedOnlyUsedFonts", uno::makeAny(bEmbedUsedFonts)); - xProps->setPropertyValue("EmbedLatinScriptFonts", uno::makeAny(bEmbedLatinScriptFonts)); - xProps->setPropertyValue("EmbedAsianScriptFonts", uno::makeAny(bEmbedAsianScriptFonts)); - xProps->setPropertyValue("EmbedComplexScriptFonts", uno::makeAny(bEmbedComplexScriptFonts)); + xProps->setPropertyValue("EmbedFonts", uno::Any(bEmbedFonts)); + xProps->setPropertyValue("EmbedOnlyUsedFonts", uno::Any(bEmbedUsedFonts)); + xProps->setPropertyValue("EmbedLatinScriptFonts", uno::Any(bEmbedLatinScriptFonts)); + xProps->setPropertyValue("EmbedAsianScriptFonts", uno::Any(bEmbedAsianScriptFonts)); + xProps->setPropertyValue("EmbedComplexScriptFonts", uno::Any(bEmbedComplexScriptFonts)); } catch( uno::Exception& ) { diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 6718ccd721d9..859c5663f1dd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -354,7 +354,7 @@ void FileDialogHelper_Impl::SaveLastUsedFilter() std::optional<OUString> pConfigId = GetLastFilterConfigId( meContext ); if( pConfigId ) SvtViewOptions( EViewType::Dialog, IODLG_CONFIGNAME ).SetUserItem( *pConfigId, - makeAny( getFilterWithExtension( getFilter() ) ) ); + Any( getFilterWithExtension( getFilter() ) ) ); } std::shared_ptr<const SfxFilter> FileDialogHelper_Impl::getCurentSfxFilter() @@ -506,7 +506,7 @@ void FileDialogHelper_Impl::updateSelectionBox() ExtendedFilePickerElementIds::CHECKBOX_SELECTION, ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SfxFilterFlags::SUPPORTSSELECTION ) ) ); uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( mbSelection ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, Any( mbSelection ) ); } } @@ -530,14 +530,14 @@ void FileDialogHelper_Impl::enablePasswordBox( bool bInit ) { uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); if( mbPwdCheckBoxState ) - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( true ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, Any( true ) ); } } else if( !bWasEnabled && mbIsPwdEnabled ) { uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); if( mbPwdCheckBoxState ) - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( true ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, Any( true ) ); } else if( bWasEnabled && !mbIsPwdEnabled ) { @@ -546,7 +546,7 @@ void FileDialogHelper_Impl::enablePasswordBox( bool bInit ) Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0 ); bool bPassWord = false; mbPwdCheckBoxState = ( aValue >>= bPassWord ) && bPassWord; - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( false ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, Any( false ) ); } } @@ -1067,22 +1067,22 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( { pInitArguments[0] <<= NamedValue( "TemplateDescription", - makeAny( nTemplateDescription ) + Any( nTemplateDescription ) ); pInitArguments[1] <<= NamedValue( "StandardDir", - makeAny( sStandardDir ) + Any( sStandardDir ) ); pInitArguments[2] <<= NamedValue( "DenyList", - makeAny( rDenyList ) + Any( rDenyList ) ); if (xWindow.is()) - pInitArguments[3] <<= NamedValue("ParentWindow", makeAny(xWindow)); + pInitArguments[3] <<= NamedValue("ParentWindow", Any(xWindow)); } try @@ -1216,7 +1216,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con DBG_ASSERT( INetURLObject( OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INetProtocol::NotValid, "Wrong HelpId!" ); OUString sId = sHelpIdPrefix + OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); - xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); + xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, Any( sId ) ); ++_pControlId; ++_pHelpId; } @@ -1570,7 +1570,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, } if ( aEncryptionData.hasElements() ) - rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData) ) ); + rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData) ) ); } } catch( const IllegalArgumentException& ){} @@ -2009,15 +2009,15 @@ void SaveLastDirectory(OUString const& sContext, OUString const& sDirectory) if (found) { Reference<XPropertySet> el(v.get<Reference<XPropertySet>>(), UNO_SET_THROW); - el->setPropertyValue("LastPath", makeAny(sDirectory)); + el->setPropertyValue("LastPath", Any(sDirectory)); } else { Reference<XPropertySet> el( (Reference<lang::XSingleServiceFactory>(set, UNO_QUERY_THROW)->createInstance()), UNO_QUERY_THROW); - el->setPropertyValue("LastPath", makeAny(sDirectory)); - Any v2(makeAny(el)); + el->setPropertyValue("LastPath", Any(sDirectory)); + Any v2(el); set->insertByName(sContext, v2); } batch->commit(); @@ -2053,7 +2053,7 @@ void FileDialogHelper_Impl::saveConfig() aFilter = EncodeSpaces_Impl( aFilter ); SetToken( aUserData, 3, ' ', aFilter ); - aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aUserData ) ); + aDlgOpt.SetUserItem( USERITEM_NAME, Any( aUserData ) ); } catch( const IllegalArgumentException& ){} } @@ -2110,7 +2110,7 @@ void FileDialogHelper_Impl::saveConfig() } if ( bWriteConfig ) - aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aUserData ) ); + aDlgOpt.SetUserItem( USERITEM_NAME, Any( aUserData ) ); } // Store to config, if explicit context is set. Otherwise store in (global) runtime var. @@ -2942,7 +2942,7 @@ ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, // be unavailable, even for non-ODF documents, so append it here unconditionally pSet->Put(SfxUnoAnyItem( SID_ENCRYPTIONDATA, - uno::makeAny(comphelper::concatSequences( + uno::Any(comphelper::concatSequences( aEncryptionData, comphelper::OStorageHelper::CreatePackageEncryptionData( pPasswordRequest->getPassword()))))); } @@ -2959,7 +2959,7 @@ ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, pPasswordRequest->getPasswordToModify()); if (aModifyPasswordInfo.hasElements()) pSet->Put( - SfxUnoAnyItem(SID_MODIFYPASSWORDINFO, uno::makeAny(aModifyPasswordInfo))); + SfxUnoAnyItem(SID_MODIFYPASSWORDINFO, uno::Any(aModifyPasswordInfo))); } else { @@ -2968,14 +2968,14 @@ ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, pPasswordRequest->getPasswordToModify(), pCurrentFilter->GetServiceName() == "com.sun.star.text.TextDocument"); if (nHash) - pSet->Put(SfxUnoAnyItem(SID_MODIFYPASSWORDINFO, uno::makeAny(nHash))); + pSet->Put(SfxUnoAnyItem(SID_MODIFYPASSWORDINFO, uno::Any(nHash))); } } else { uno::Sequence< beans::PropertyValue > aModifyPasswordInfo = ::comphelper::DocPasswordHelper::GenerateNewModifyPasswordInfo( pPasswordRequest->getPasswordToModify() ); if ( aModifyPasswordInfo.hasElements() ) - pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( aModifyPasswordInfo ) ) ); + pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::Any( aModifyPasswordInfo ) ) ); } } else diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index f1afa3b08664..2abedce119a4 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -326,7 +326,7 @@ void SfxSplitWindow::SaveConfig_Impl() const OUString aWindowId{ "SplitWindow" + OUString::number(static_cast<sal_Int32>(GetAlign())) }; SvtViewOptions aWinOpt( EViewType::Window, aWindowId ); - aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) ); + aWinOpt.SetUserItem( USERITEM_NAME, Any( aWinData.makeStringAndClear() ) ); } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index ea9f8c7766c6..fdd42e7e6c0c 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -101,7 +101,7 @@ void SearchDialog::SaveConfig() OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 ) + ";" + OUString::number( m_xBackwardsBox->get_active() ? 1 : 0 ); - Any aUserItem = makeAny( sUserData ); + Any aUserItem( sUserData ); aViewOpt.SetUserItem( "UserItem", aUserItem ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 985f4169add7..11a43a498f9f 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -719,7 +719,7 @@ SfxTabDialogController::~SfxTabDialogController() OUString sConfigId = OStringToOUString(elem->xTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8); SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); - aPageOpt.SetUserItem( USERITEM_NAME, makeAny( aPageData ) ); + aPageOpt.SetUserItem( USERITEM_NAME, Any( aPageData ) ); } elem->xTabPage.reset(); @@ -963,7 +963,7 @@ void SfxTabDialogController::RemoveTabPage(const OString& rId) OUString sConfigId = OStringToOUString(pDataObject->xTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8); SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); - aPageOpt.SetUserItem( USERITEM_NAME, makeAny( aPageData ) ); + aPageOpt.SetUserItem( USERITEM_NAME, Any( aPageData ) ); } pDataObject->xTabPage.reset(); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5c28cbc6bf66..e1db058dbfbd 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -611,7 +611,7 @@ void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell const OSL_ENSURE( i_pObjSh, "SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" ); Sequence< PropertyValue > lProps{ comphelper::makePropertyValue( "ooSetupFactoryStyleFilter", i_nFilter | (m_bWantHierarchical ? 0x1000 : 0)) }; - xModuleManager->replaceByName( getModuleIdentifier( xModuleManager, i_pObjSh ), makeAny( lProps ) ); + xModuleManager->replaceByName( getModuleIdentifier( xModuleManager, i_pObjSh ), Any( lProps ) ); } IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, SaveSelection_Hdl, StyleList&, SfxObjectShell*) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 90e704ab7ef1..47f33b63430c 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -268,7 +268,7 @@ void SfxVersionDialog::Open_Impl() if ( GetEncryptionData_Impl( pObjShell->GetMedium()->GetItemSet(), aEncryptionData ) ) { // there is a password, it should be used during the opening - SfxUnoAnyItem aEncryptionDataItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ); + SfxUnoAnyItem aEncryptionDataItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ); m_pViewFrame->GetDispatcher()->ExecuteList( SID_OPENDOC, SfxCallMode::ASYNCHRON, { &aFile, &aItem, &aTarget, &aReferer, &aEncryptionDataItem }); diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 59c164501325..3bb670c7b1dd 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -482,7 +482,7 @@ getAllParts(struct DocumentMetadataAccess_Impl const& i_rImpl, catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException("getAllParts: exception", nullptr, - uno::makeAny(e)); + uno::Any(e)); } } @@ -497,11 +497,11 @@ mkException( OUString const & i_rMessage, iaioe.Code = i_ErrorCode; const beans::PropertyValue uriProp("Uri", - -1, uno::makeAny(i_rUri), static_cast<beans::PropertyState>(0)); + -1, uno::Any(i_rUri), static_cast<beans::PropertyState>(0)); const beans::PropertyValue rnProp( "ResourceName", - -1, uno::makeAny(i_rResource), static_cast<beans::PropertyState>(0)); - iaioe.Arguments = { uno::makeAny(uriProp), uno::makeAny(rnProp) }; + -1, uno::Any(i_rResource), static_cast<beans::PropertyState>(0)); + iaioe.Arguments = { uno::Any(uriProp), uno::Any(rnProp) }; return iaioe; } @@ -520,11 +520,11 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, if (!i_xHandler.is()) { throw lang::WrappedTargetException( "DocumentMetadataAccess::loadMetadataFromStorage: exception", - /* *this*/ nullptr, uno::makeAny(i_rException)); + /* *this*/ nullptr, uno::Any(i_rException)); } ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( - new ::comphelper::OInteractionRequest(uno::makeAny(i_rException)) ); + new ::comphelper::OInteractionRequest(uno::Any(i_rException)) ); ::rtl::Reference< ::comphelper::OInteractionRetry > pRetry( new ::comphelper::OInteractionRetry ); ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( @@ -544,7 +544,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, OSL_ENSURE(pAbort->wasSelected(), "no continuation selected?"); throw lang::WrappedTargetException( "DocumentMetadataAccess::loadMetadataFromStorage: exception", - /* *this*/ nullptr, uno::makeAny(i_rException)); + /* *this*/ nullptr, uno::Any(i_rException)); } } @@ -674,7 +674,7 @@ exportStream(struct DocumentMetadataAccess_Impl const & i_rImpl, if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( "MediaType", - uno::makeAny(OUString("application/rdf+xml"))); + uno::Any(OUString("application/rdf+xml"))); } const uno::Reference<io::XOutputStream> xOutStream( xStream->getOutputStream(), uno::UNO_SET_THROW ); @@ -1372,7 +1372,7 @@ DocumentMetadataAccess::storeMetadataToMedium( "DocumentMetadataAccess::storeMetadataToMedium Commit failed: " + nError.toHexString(), uno::Reference< uno::XInterface >(), sal_uInt32(nError)); throw lang::WrappedTargetException(OUString(), *this, - uno::makeAny(ex)); + uno::Any(ex)); } } diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 04d1fadf5838..eac3efc494c4 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -589,7 +589,7 @@ SfxDocumentMetaData::getURLProperties( } xPropArg->addProperty("StreamName", css::beans::PropertyAttribute::MAYBEVOID, - css::uno::makeAny(OUString(s_meta))); + css::uno::Any(OUString(s_meta))); } catch (const css::uno::Exception &) { // ignore } @@ -1810,13 +1810,13 @@ SfxDocumentMetaData::storeToStorage( css::uno::UNO_QUERY_THROW); xStreamProps->setPropertyValue( "MediaType", - css::uno::makeAny(OUString("text/xml"))); + css::uno::Any(OUString("text/xml"))); xStreamProps->setPropertyValue( "Compressed", - css::uno::makeAny(false)); + css::uno::Any(false)); xStreamProps->setPropertyValue( "UseCommonStoragePasswordEncryption", - css::uno::makeAny(false)); + css::uno::Any(false)); css::uno::Reference<css::io::XOutputStream> xOutStream = xStream->getOutputStream(); if (!xOutStream.is()) throw css::uno::RuntimeException(); diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index 34643e721478..beb96b55d622 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -119,10 +119,10 @@ void setPageMargins(const uno::Reference<beans::XPropertySet>& xPageProperySet, || aPageMargins.nRight < 0) return; - xPageProperySet->setPropertyValue("BorderTop", css::uno::makeAny(aPageMargins.nTop)); - xPageProperySet->setPropertyValue("BorderBottom", css::uno::makeAny(aPageMargins.nBottom)); - xPageProperySet->setPropertyValue("BorderLeft", css::uno::makeAny(aPageMargins.nLeft)); - xPageProperySet->setPropertyValue("BorderRight", css::uno::makeAny(aPageMargins.nRight)); + xPageProperySet->setPropertyValue("BorderTop", css::uno::Any(aPageMargins.nTop)); + xPageProperySet->setPropertyValue("BorderBottom", css::uno::Any(aPageMargins.nBottom)); + xPageProperySet->setPropertyValue("BorderLeft", css::uno::Any(aPageMargins.nLeft)); + xPageProperySet->setPropertyValue("BorderRight", css::uno::Any(aPageMargins.nRight)); } // #i10613# Extracted from ImplCheckRect::ImplCreate @@ -235,8 +235,8 @@ void SfxRedactionHelper::addPagesToDraw( // Set page size & margins uno::Reference<beans::XPropertySet> xPageProperySet(xPage, uno::UNO_QUERY); - xPageProperySet->setPropertyValue("Height", css::uno::makeAny(nPageHeight)); - xPageProperySet->setPropertyValue("Width", css::uno::makeAny(nPageWidth)); + xPageProperySet->setPropertyValue("Height", css::uno::Any(nPageHeight)); + xPageProperySet->setPropertyValue("Width", css::uno::Any(nPageWidth)); setPageMargins(xPageProperySet, aPageMargins); @@ -493,10 +493,10 @@ void SfxRedactionHelper::addRedactionRectToPage( xRectShapeProperySet->setPropertyValue("Name", uno::Any(OUString("RectangleRedactionShape"))); xRectShapeProperySet->setPropertyValue("FillTransparence", - css::uno::makeAny(static_cast<sal_Int16>(50))); - xRectShapeProperySet->setPropertyValue("FillColor", css::uno::makeAny(COL_GRAY7)); + css::uno::Any(static_cast<sal_Int16>(50))); + xRectShapeProperySet->setPropertyValue("FillColor", css::uno::Any(COL_GRAY7)); xRectShapeProperySet->setPropertyValue( - "LineStyle", css::uno::makeAny(css::drawing::LineStyle::LineStyle_NONE)); + "LineStyle", css::uno::Any(css::drawing::LineStyle::LineStyle_NONE)); xRectShape->setSize(awt::Size(aNewRectangle.GetWidth(), aNewRectangle.GetHeight())); xRectShape->setPosition(awt::Point(aNewRectangle.Left(), aNewRectangle.Top())); diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx index 2d94cd3b6621..6509f8c47360 100644 --- a/sfx2/source/doc/autoredactdialog.cxx +++ b/sfx2/source/doc/autoredactdialog.cxx @@ -615,7 +615,7 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog() // Store the dialog data SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sUserDataStr)); + aDlgOpt.SetUserItem("UserItem", css::uno::Any(sUserDataStr)); if (!m_bTargetsCopied) clearTargets(); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 481dd5a683e3..a222ef7e4d49 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -217,7 +217,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY ); xStorable->storeToURL( sUserTemplateURL, aArgs ); - ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, sConfPath, PROP_DEF_TEMPL_CHANGED, uno::makeAny( true )); + ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, sConfPath, PROP_DEF_TEMPL_CHANGED, uno::Any( true )); ::comphelper::ConfigurationHelper::flush( xConfig ); } else @@ -226,7 +226,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU xSimpleFileAccess->copy( aBackupURL, sUserTemplateURL ); xSimpleFileAccess->kill( aBackupURL ); - ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, sConfPath, PROP_DEF_TEMPL_CHANGED, uno::makeAny( false )); + ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, sConfPath, PROP_DEF_TEMPL_CHANGED, uno::Any( false )); ::comphelper::ConfigurationHelper::flush( xConfig ); } } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c5a43f96797c..f38fcfc70fad 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -524,7 +524,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) try { - ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( + ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::Any( document::ChangedByOthersRequest() ) ); uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations{ new ::ucbhelper::InteractionAbort( xInteractionRequestImpl.get() ), @@ -971,7 +971,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() // replace the password with encryption data pImpl->m_pSet->ClearItem( SID_PASSWORD ); - pImpl->m_pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); + pImpl->m_pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); try { @@ -1060,7 +1060,7 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const LockFileEntr { aInfo = aData[LockFileComponent::EDITTIME]; - xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( + xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::Any( document::OwnLockOnDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); } else @@ -1085,13 +1085,13 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const LockFileEntr if (!bIsLoading) // so, !bHandleSysLocked { - xInteractionRequestImpl = new ::ucbhelper::InteractionRequest(uno::makeAny( + xInteractionRequestImpl = new ::ucbhelper::InteractionRequest(uno::Any( document::LockedOnSavingRequest(OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo))); // Currently, only the last "Retry" continuation (meaning ignore the lock and try overwriting) can be returned. } else /*logically therefore bIsLoading is set */ { - xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( + xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::Any( document::LockedDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } } @@ -1189,10 +1189,10 @@ bool SfxMedium::ShowLockFileProblemDialog(MessageDlg nWhichDlg) switch (nWhichDlg) { case MessageDlg::LockFileIgnore: - xIgnoreRequestImpl = new ::ucbhelper::InteractionRequest(uno::makeAny( document::LockFileIgnoreRequest() )); + xIgnoreRequestImpl = new ::ucbhelper::InteractionRequest(uno::Any( document::LockFileIgnoreRequest() )); break; case MessageDlg::LockFileCorrupt: - xIgnoreRequestImpl = new ::ucbhelper::InteractionRequest(uno::makeAny( document::LockFileCorruptRequest() )); + xIgnoreRequestImpl = new ::ucbhelper::InteractionRequest(uno::Any( document::LockFileCorruptRequest() )); break; } @@ -1710,7 +1710,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempFile ) aArgs.realloc(3); // ??? this may re-write the data added above for pRepairItem pArgs = aArgs.getArray(); uno::Sequence<beans::PropertyValue> aProperties( - comphelper::InitPropertySequence({ { "NoFileSync", uno::makeAny(true) } })); + comphelper::InitPropertySequence({ { "NoFileSync", uno::Any(true) } })); pArgs[2] <<= aProperties; } } @@ -2099,7 +2099,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, { Reference< XInputStream > aTempInput = aTempCont.openStream(); bTransactStarted = true; - aOriginalContent.setPropertyValue( "Size", uno::makeAny( sal_Int64(0) ) ); + aOriginalContent.setPropertyValue( "Size", uno::Any( sal_Int64(0) ) ); aOriginalContent.writeStream( aTempInput, bOverWrite ); bResult = true; } @@ -2759,7 +2759,7 @@ void SfxMedium::GetMedium_Impl() if( !(pImpl->m_nStorOpenMode & StreamMode::WRITE) ) GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if (xInteractionHandler.is()) - GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny(xInteractionHandler) ) ); + GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any(xInteractionHandler) ) ); } if ( pImpl->m_xInputStreamToLoadFrom.is() ) @@ -2818,9 +2818,9 @@ void SfxMedium::GetMedium_Impl() { //TODO/MBA: need support for SID_STREAM if ( pImpl->xStream.is() ) - GetItemSet()->Put( SfxUnoAnyItem( SID_STREAM, makeAny( pImpl->xStream ) ) ); + GetItemSet()->Put( SfxUnoAnyItem( SID_STREAM, Any( pImpl->xStream ) ) ); - GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, makeAny( pImpl->xInputStream ) ) ); + GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, Any( pImpl->xInputStream ) ) ); } } @@ -4581,7 +4581,7 @@ IMPL_STATIC_LINK(SfxMedium, ShowReloadEditableDialog, void*, p, void) OUString aDocumentURL = pMed->GetURLObject().GetLastName(INetURLObject::DecodeMechanism::WithCharset); ::rtl::Reference<::ucbhelper::InteractionRequest> xInteractionRequestImpl - = new ::ucbhelper::InteractionRequest(uno::makeAny(document::ReloadEditableRequest( + = new ::ucbhelper::InteractionRequest(uno::Any(document::ReloadEditableRequest( OUString(), uno::Reference<uno::XInterface>(), aDocumentURL))); if (xInteractionRequestImpl != nullptr) { diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 10630d0f3eae..3a868411375d 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -91,7 +91,7 @@ namespace sfx2 ErrorCodeRequest aErrorCodeRequest; aErrorCodeRequest.ErrCode = sal_uInt32(nSfxErrorCode); - SfxMedium::CallApproveHandler( rxHandler, makeAny( aErrorCodeRequest ), false ); + SfxMedium::CallApproveHandler( rxHandler, Any( aErrorCodeRequest ), false ); rbAlreadyShown = true; } @@ -121,7 +121,7 @@ namespace sfx2 { DocumentMacroConfirmationRequest aRequest; aRequest.DocumentURL = rDocumentLocation; - return SfxMedium::CallApproveHandler( rxHandler, makeAny( aRequest ), true ); + return SfxMedium::CallApproveHandler( rxHandler, Any( aRequest ), true ); } } diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index cf9d70ceae75..f464ab66f4a3 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -761,7 +761,7 @@ bool SfxDocumentTemplates::CopyTo aTransferInfo.NewTitle = aTitle; aTransferInfo.NameClash = NameClash::RENAME; - Any aArg = makeAny( aTransferInfo ); + Any aArg( aTransferInfo ); aTarget.executeCommand( COMMAND_TRANSFER, aArg ); } catch ( ContentCreationException& ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index a478158edbe5..6005aa5fdd8e 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -418,7 +418,7 @@ void SfxDocTplService_Impl::init_Impl() if ( !bIsInitialized ) { if ( createFolder( maRootURL, true, false, maRootContent ) - && setProperty( maRootContent, aTemplVersPropName, uno::makeAny( aTemplVers ) ) ) + && setProperty( maRootContent, aTemplVersPropName, uno::Any( aTemplVers ) ) ) bIsInitialized = true; bNeedsUpdate = true; @@ -706,7 +706,7 @@ bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, try { rParentFolder.insertNewContent( TYPE_LINK, { TITLE, IS_FOLDER, TARGET_URL }, aValues, aLink ); - setProperty( aLink, PROPERTY_TYPE, makeAny( rType ) ); + setProperty( aLink, PROPERTY_TYPE, Any( rType ) ); bAddedEntry = true; } catch( Exception& ) @@ -888,7 +888,7 @@ bool SfxDocTplService_Impl::removeContent( Content& rContent ) bool bRemoved = false; try { - Any aArg = makeAny( true ); + Any aArg( true ); rContent.executeCommand( COMMAND_DELETE, aArg ); bRemoved = true; @@ -1132,7 +1132,7 @@ void SfxDocTplService_Impl::doUpdate() if ( Content::create( pGroup->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) setProperty( aGroup, TARGET_DIR_URL, - makeAny( pGroup->getTargetURL() ) ); + Any( pGroup->getTargetURL() ) ); size_t nCount = pGroup->count(); for ( size_t i=0; i<nCount; i++ ) @@ -1339,7 +1339,7 @@ OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, } // Now set the target url for this group and we are done - Any aValue = makeAny( aResultURL ); + Any aValue( aResultURL ); if ( ! setProperty( aGroup, TARGET_DIR_URL, aValue ) ) { @@ -1421,7 +1421,7 @@ bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) } // Now set the target url for this group and we are done - Any aValue = makeAny( aNewFolderURL ); + Any aValue( aNewFolderURL ); if ( ! setProperty( aNewGroup, TARGET_DIR_URL, aValue ) ) { @@ -1528,7 +1528,7 @@ bool SfxDocTplService_Impl::removeGroup( std::u16string_view rGroupName ) || !::utl::UCBContentHelper::Exists( aGroupTargetURL ) ) { RemoveUINamesForTemplateDir_Impl( aGeneralTempPath, rGroupName ); - setProperty( aGroup, aPropName, uno::makeAny( OUString() ) ); + setProperty( aGroup, aPropName, uno::Any( OUString() ) ); } } } @@ -1923,7 +1923,7 @@ bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, uno::Any aProperty; bool bReadOnly = false; if ( getProperty( aResultContent, aPropertyName, aProperty ) && ( aProperty >>= bReadOnly ) && bReadOnly ) - setProperty( aResultContent, aPropertyName, uno::makeAny( false ) ); + setProperty( aResultContent, aPropertyName, uno::Any( false ) ); } } catch ( ContentCreationException& ) @@ -2517,12 +2517,12 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl const *pData if ( pData->getUpdateType() ) { - setProperty( aTemplate, PROPERTY_TYPE, makeAny( pData->getType() ) ); + setProperty( aTemplate, PROPERTY_TYPE, Any( pData->getType() ) ); } if ( pData->getUpdateLink() ) { - setProperty( aTemplate, TARGET_URL, makeAny( pData->getTargetURL() ) ); + setProperty( aTemplate, TARGET_URL, Any( pData->getTargetURL() ) ); } } @@ -2540,7 +2540,7 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup ) if ( createFolder( aNewGroupURL, false, false, aGroup ) ) { - setProperty( aGroup, TARGET_DIR_URL, makeAny( pGroup->getTargetURL() ) ); + setProperty( aGroup, TARGET_DIR_URL, Any( pGroup->getTargetURL() ) ); pGroup->setHierarchyURL( aNewGroupURL ); size_t nCount = pGroup->count(); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index cc26abcb0606..23c75f29653a 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -216,7 +216,7 @@ public: { OUString aLoadReadonlyString( "LoadReadonly" ); m_xDocumentSettings->getPropertyValue( aLoadReadonlyString ) >>= m_bPreserveReadOnly; - m_xDocumentSettings->setPropertyValue( aLoadReadonlyString, uno::makeAny( bReadOnly ) ); + m_xDocumentSettings->setPropertyValue( aLoadReadonlyString, uno::Any( bReadOnly ) ); m_bReadOnlySupported = true; } catch( const uno::Exception& ) @@ -236,7 +236,7 @@ public: try { if ( m_bReadOnlySupported ) - m_xDocumentSettings->setPropertyValue( "LoadReadonly", uno::makeAny( m_bPreserveReadOnly ) ); + m_xDocumentSettings->setPropertyValue( "LoadReadonly", uno::Any( m_bPreserveReadOnly ) ); } catch( const uno::Exception& ) { @@ -481,7 +481,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) { - uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } }; + uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::Any(GetDocServiceName()) } }; return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); } @@ -502,8 +502,8 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( // Preselect PDF-Filter for EXPORT uno::Sequence< beans::NamedValue > aSearchRequest { - { "Type", css::uno::makeAny(OUString("pdf_Portable_Document_Format")) }, - { "DocumentService", css::uno::makeAny(GetDocServiceName()) } + { "Type", css::uno::Any(OUString("pdf_Portable_Document_Format")) }, + { "DocumentService", css::uno::Any(GetDocServiceName()) } }; aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -513,8 +513,8 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( // Preselect EPUB filter for export. uno::Sequence<beans::NamedValue> aSearchRequest { - { "Type", css::uno::makeAny(OUString("writer_EPUB_Document")) }, - { "DocumentService", css::uno::makeAny(GetDocServiceName()) } + { "Type", css::uno::Any(OUString("writer_EPUB_Document")) }, + { "DocumentService", css::uno::Any(GetDocServiceName()) } }; aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -770,7 +770,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) bool ModelData_Impl::CheckFilterOptionsDialogExistence() { - uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } }; + uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::Any(GetDocServiceName()) } }; uno::Reference< container::XEnumeration > xFilterEnum = m_pOwner->GetFilterQuery()->createSubSetEnumerationByProperties( aSearchRequest ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 37edc065bd88..a6922befcc95 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -308,7 +308,7 @@ SfxNewFileDialog::SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode n SfxNewFileDialog::~SfxNewFileDialog() { SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(m_xMoreBt->get_expanded() ? OUString("Y") : OUString("N"))); + aDlgOpt.SetUserItem("UserItem", css::uno::Any(m_xMoreBt->get_expanded() ? OUString("Y") : OUString("N"))); } bool SfxNewFileDialog::IsTemplate() const diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index a09a7ac9feef..9ab91983f2c2 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -985,7 +985,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract css::task::ErrorCodeRequest aErrorCode; aErrorCode.ErrCode = sal_uInt32(ERRCODE_SFX_INCOMPLETE_ENCRYPTION); - SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), false ); + SfxMedium::CallApproveHandler( xHandler, uno::Any( aErrorCode ), false ); pImpl->m_bIncomplEncrWarnShown = true; } @@ -1413,7 +1413,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon { Reference< provider::XScriptProviderFactory > xScriptProviderFactory = provider::theMasterScriptProviderFactory::get( ::comphelper::getProcessComponentContext() ); - xScriptProvider.set( xScriptProviderFactory->createScriptProvider( makeAny( _rxScriptContext ) ), UNO_SET_THROW ); + xScriptProvider.set( xScriptProviderFactory->createScriptProvider( Any( _rxScriptContext ) ), UNO_SET_THROW ); } // ry to protect the invocation context's undo manager (if present), just in case the script tampers with it @@ -1427,7 +1427,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon if ( xProps.is() ) { Sequence< uno::Any > aArgs{ *pCaller }; - xProps->setPropertyValue("Caller", uno::makeAny( aArgs ) ); + xProps->setPropertyValue("Caller", uno::Any( aArgs ) ); } } aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam ); @@ -1841,7 +1841,7 @@ bool SfxObjectShell_Impl::hasTrustedScriptingSignature( bool bAllowUIToAddAuthor aRequest.DocumentSignatureInformation = aInfo; aRequest.DocumentVersion = aVersion; aRequest.Classification = task::InteractionClassification_QUERY; - bResult = SfxMedium::CallApproveHandler( xInteraction, uno::makeAny( aRequest ), true ); + bResult = SfxMedium::CallApproveHandler( xInteraction, uno::Any( aRequest ), true ); } } } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 2fd20952042f..452d059d0c16 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -795,32 +795,32 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if (sShapeName == "RectangleRedactionShape" && xInfo->hasPropertyByName("FillTransparence") && xInfo->hasPropertyByName("FillColor")) { - xPropSet->setPropertyValue("FillTransparence", css::uno::makeAny(static_cast<sal_Int16>(0))); + xPropSet->setPropertyValue("FillTransparence", css::uno::Any(static_cast<sal_Int16>(0))); if (sRedactionStyle == "White") { - xPropSet->setPropertyValue("FillColor", css::uno::makeAny(COL_WHITE)); - xPropSet->setPropertyValue("LineStyle", css::uno::makeAny(css::drawing::LineStyle::LineStyle_SOLID)); - xPropSet->setPropertyValue("LineColor", css::uno::makeAny(COL_BLACK)); + xPropSet->setPropertyValue("FillColor", css::uno::Any(COL_WHITE)); + xPropSet->setPropertyValue("LineStyle", css::uno::Any(css::drawing::LineStyle::LineStyle_SOLID)); + xPropSet->setPropertyValue("LineColor", css::uno::Any(COL_BLACK)); } else { - xPropSet->setPropertyValue("FillColor", css::uno::makeAny(COL_BLACK)); - xPropSet->setPropertyValue("LineStyle", css::uno::makeAny(css::drawing::LineStyle::LineStyle_NONE)); + xPropSet->setPropertyValue("FillColor", css::uno::Any(COL_BLACK)); + xPropSet->setPropertyValue("LineStyle", css::uno::Any(css::drawing::LineStyle::LineStyle_NONE)); } } // Freeform redaction else if (sShapeName == "FreeformRedactionShape" && xInfo->hasPropertyByName("LineTransparence") && xInfo->hasPropertyByName("LineColor")) { - xPropSet->setPropertyValue("LineTransparence", css::uno::makeAny(static_cast<sal_Int16>(0))); + xPropSet->setPropertyValue("LineTransparence", css::uno::Any(static_cast<sal_Int16>(0))); if (sRedactionStyle == "White") { - xPropSet->setPropertyValue("LineColor", css::uno::makeAny(COL_WHITE)); + xPropSet->setPropertyValue("LineColor", css::uno::Any(COL_WHITE)); } else { - xPropSet->setPropertyValue("LineColor", css::uno::makeAny(COL_BLACK)); + xPropSet->setPropertyValue("LineColor", css::uno::Any(COL_BLACK)); } } } @@ -890,7 +890,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( xStatusIndicator.is() ) { - SfxUnoAnyItem aStatIndItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::makeAny( xStatusIndicator ) ); + SfxUnoAnyItem aStatIndItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::Any( xStatusIndicator ) ); if ( nId == SID_SAVEDOC ) { @@ -923,7 +923,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) uno::Reference< task::XInteractionHandler2 > xInteract( task::InteractionHandler::createWithParent(xContext, xParentWindow) ); - SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) ); + SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::Any( xInteract ) ); if ( nId == SID_SAVEDOC ) { // in case of saving it is not possible to transport the parameters from here @@ -1085,16 +1085,16 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if (sShapeName == "RectangleRedactionShape" && xInfo->hasPropertyByName("FillTransparence") && xInfo->hasPropertyByName("FillColor")) { - xPropSet->setPropertyValue("FillTransparence", css::uno::makeAny(static_cast<sal_Int16>(50))); - xPropSet->setPropertyValue("FillColor", css::uno::makeAny(COL_GRAY7)); - xPropSet->setPropertyValue("LineStyle", css::uno::makeAny(css::drawing::LineStyle::LineStyle_NONE)); + xPropSet->setPropertyValue("FillTransparence", css::uno::Any(static_cast<sal_Int16>(50))); + xPropSet->setPropertyValue("FillColor", css::uno::Any(COL_GRAY7)); + xPropSet->setPropertyValue("LineStyle", css::uno::Any(css::drawing::LineStyle::LineStyle_NONE)); } // Freeform redaction else if (sShapeName == "FreeformRedactionShape") { - xPropSet->setPropertyValue("LineTransparence", css::uno::makeAny(static_cast<sal_Int16>(50))); - xPropSet->setPropertyValue("LineColor", css::uno::makeAny(COL_GRAY7)); + xPropSet->setPropertyValue("LineTransparence", css::uno::Any(static_cast<sal_Int16>(50))); + xPropSet->setPropertyValue("LineColor", css::uno::Any(COL_GRAY7)); } } } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index b86750aef052..fec08d32a0ba 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -136,7 +136,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& css::frame::theGlobalEventBroadcaster::get(xContext); try { - xModelCollection->insert(css::uno::makeAny(xModel)); + xModelCollection->insert(css::uno::Any(xModel)); } catch ( uno::Exception& ) { @@ -309,7 +309,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto try { - xProps->setPropertyValue("MediaType", uno::makeAny( aDataFlavor.MimeType ) ); + xProps->setPropertyValue("MediaType", uno::Any( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) { @@ -325,9 +325,9 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto // the default values, that should be used for ODF1.1 and older formats uno::Sequence< beans::NamedValue > aEncryptionAlgs { - { "StartKeyGenerationAlgorithm", css::uno::makeAny(xml::crypto::DigestID::SHA1) }, - { "EncryptionAlgorithm", css::uno::makeAny(xml::crypto::CipherID::BLOWFISH_CFB_8) }, - { "ChecksumAlgorithm", css::uno::makeAny(xml::crypto::DigestID::SHA1_1K) } + { "StartKeyGenerationAlgorithm", css::uno::Any(xml::crypto::DigestID::SHA1) }, + { "EncryptionAlgorithm", css::uno::Any(xml::crypto::CipherID::BLOWFISH_CFB_8) }, + { "ChecksumAlgorithm", css::uno::Any(xml::crypto::DigestID::SHA1_1K) } }; if (nDefVersion >= SvtSaveOptions::ODFSVER_012) @@ -341,11 +341,11 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto SAL_INFO_IF(isBaseForm, "sfx.doc", "tdf#138209 force form export to ODF 1.2"); if (!isBaseForm && SvtSaveOptions::ODFSVER_013 <= nDefVersion) { - xProps->setPropertyValue("Version", uno::makeAny<OUString>(ODFVER_013_TEXT)); + xProps->setPropertyValue("Version", uno::Any(OUString(ODFVER_013_TEXT))); } else { - xProps->setPropertyValue("Version", uno::makeAny<OUString>(ODFVER_012_TEXT)); + xProps->setPropertyValue("Version", uno::Any(OUString(ODFVER_012_TEXT))); } } catch( uno::Exception& ) @@ -727,7 +727,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) bool bSetProperty = true; try { - xSet->setPropertyValue( sLockUpdates, makeAny( true ) ); + xSet->setPropertyValue( sLockUpdates, Any( true ) ); } catch(const beans::UnknownPropertyException& ) { @@ -738,7 +738,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { try { - xSet->setPropertyValue( sLockUpdates, makeAny( false ) ); + xSet->setPropertyValue( sLockUpdates, Any( false ) ); } catch(const beans::UnknownPropertyException& ) {} @@ -994,11 +994,11 @@ bool SfxObjectShell::DoSave() SAL_INFO_IF(isBaseForm, "sfx.doc", "tdf#138209 force form export to ODF 1.2"); if (!isBaseForm && SvtSaveOptions::ODFSVER_013 <= nDefVersion) { - xProps->setPropertyValue("Version", uno::makeAny<OUString>(ODFVER_013_TEXT)); + xProps->setPropertyValue("Version", uno::Any(OUString(ODFVER_013_TEXT))); } else { - xProps->setPropertyValue("Version", uno::makeAny<OUString>(ODFVER_012_TEXT)); + xProps->setPropertyValue("Version", uno::Any(OUString(ODFVER_012_TEXT))); } } catch (uno::Exception&) @@ -1366,7 +1366,7 @@ bool SfxObjectShell::SaveTo_Impl { uno::Reference< beans::XPropertySet > xProps( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); xProps->setPropertyValue("MediaType", - uno::makeAny( aDataFlavor.MimeType ) ); + uno::Any( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) { @@ -2301,7 +2301,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, { uno::Reference< lang::XMultiServiceFactory > xFactory(GetModel(), uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xSettings(xFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY); - xSettings->setPropertyValue("LoadReadonly", uno::makeAny(true)); + xSettings->setPropertyValue("LoadReadonly", uno::Any(true)); } xPropertyContainer->removeProperty("_MarkAsFinal"); } @@ -2588,7 +2588,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) css::uno::Reference< XInteractionHandler > xInteract; const SfxUnoAnyItem* pxInteractionItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pArgs, SID_INTERACTIONHANDLER, false); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) - pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny( xInteract ) ) ); + pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any( xInteract ) ) ); const SfxBoolItem* pNoFileSync = pArgs->GetItem<SfxBoolItem>(SID_NO_FILE_SYNC, false); if (pNoFileSync && pNoFileSync->GetValue()) @@ -2924,7 +2924,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& } if( bRet ) - pNewFile->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA, uno::makeAny(aSaveToFilterDataOptions))); + pNewFile->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA, uno::Any(aSaveToFilterDataOptions))); } } else @@ -3653,7 +3653,7 @@ bool SfxObjectShell::WriteThumbnail(bool bEncrypted, const uno::Reference<io::XS uno::Reference <beans::XPropertySet> xSet(xStream, uno::UNO_QUERY); if (xSet.is()) - xSet->setPropertyValue("MediaType", uno::makeAny(OUString("image/png"))); + xSet->setPropertyValue("MediaType", uno::Any(OUString("image/png"))); if (bEncrypted) { const OUString sResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 0e7d373c43b9..062329033264 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -2534,7 +2534,7 @@ void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::Cmis Reference<ucb::XCommandEnvironment>(), comphelper::getProcessComponentContext() ); - aContent.executeCommand( "updateProperties", uno::makeAny( aProperties ) ); + aContent.executeCommand( "updateProperties", uno::Any( aProperties ) ); loadCmisProperties( ); } catch (const Exception & e) @@ -3166,7 +3166,7 @@ void SfxBaseModel::impl_store( const OUString& sURL task::ErrorCodeRequest aErrorCode; aErrorCode.ErrCode = sal_uInt32(nErrCode); - SfxMedium::CallApproveHandler( xHandler, makeAny( aErrorCode ), false ); + SfxMedium::CallApproveHandler( xHandler, Any( aErrorCode ), false ); } } @@ -3489,7 +3489,7 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP Reference< XScriptInvocationContext > xScriptContext( this ); Reference< script::provider::XScriptProvider > xScriptProvider( - xScriptProviderFactory->createScriptProvider( makeAny( xScriptContext ) ), + xScriptProviderFactory->createScriptProvider( Any( xScriptContext ) ), UNO_SET_THROW ); return xScriptProvider; @@ -4083,7 +4083,7 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() sal_Int32 c = m_pData->m_seqControllers.size(); Sequence< Any > lEnum(c); std::transform(m_pData->m_seqControllers.begin(), m_pData->m_seqControllers.end(), - lEnum.getArray(), [](const auto& x) { return css::uno::makeAny(x); }); + lEnum.getArray(), [](const auto& x) { return css::uno::Any(x); }); return new ::comphelper::OAnyEnumeration(lEnum); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 1127ed9d57e2..ac3015ceb8c0 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -462,9 +462,9 @@ void SfxTemplateManagerDlg::writeSettings () // last folder Sequence< NamedValue > aSettings { - { TM_SETTING_LASTFOLDER, css::uno::makeAny(aLastFolder) }, - { TM_SETTING_LASTAPPLICATION, css::uno::makeAny(sal_uInt16(mxCBApp->get_active())) }, - { TM_SETTING_VIEWMODE, css::uno::makeAny(static_cast<sal_Int16>(getTemplateViewMode()))} + { TM_SETTING_LASTFOLDER, css::uno::Any(aLastFolder) }, + { TM_SETTING_LASTAPPLICATION, css::uno::Any(sal_uInt16(mxCBApp->get_active())) }, + { TM_SETTING_VIEWMODE, css::uno::Any(static_cast<sal_Int16>(getTemplateViewMode()))} }; // write diff --git a/sfx2/source/doc/watermarkitem.cxx b/sfx2/source/doc/watermarkitem.cxx index 86e3d27d6a32..4e64afd7ffbf 100644 --- a/sfx2/source/doc/watermarkitem.cxx +++ b/sfx2/source/doc/watermarkitem.cxx @@ -44,11 +44,11 @@ SfxWatermarkItem* SfxWatermarkItem::Clone( SfxItemPool *) const bool SfxWatermarkItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= comphelper::InitPropertySequence( { - { "Text", css::uno::makeAny( m_aText ) }, - { "Font", css::uno::makeAny( m_aFont ) }, - { "Angle", css::uno::makeAny( m_nAngle ) }, - { "Transparency", css::uno::makeAny( m_nTransparency ) }, - { "Color", css::uno::makeAny( m_nColor ) }, + { "Text", css::uno::Any( m_aText ) }, + { "Font", css::uno::Any( m_aFont ) }, + { "Angle", css::uno::Any( m_nAngle ) }, + { "Transparency", css::uno::Any( m_nTransparency ) }, + { "Color", css::uno::Any( m_nColor ) }, } ); return true; diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index b4c98cba61d5..78929e5b1799 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -332,8 +332,8 @@ IMPL_LINK(NotebookbarTabControl, OpenNotebookbarPopupMenu, NotebookBar*, pNotebo return; Sequence<Any> aArgs { - makeAny(comphelper::makePropertyValue("Value", OUString("notebookbar"))), - makeAny(comphelper::makePropertyValue("Frame", m_xFrame)) }; + Any(comphelper::makePropertyValue("Value", OUString("notebookbar"))), + Any(comphelper::makePropertyValue("Frame", m_xFrame)) }; Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); Reference<XPopupMenuController> xPopupController( diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 58647afe2645..aa602ba17a60 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -304,7 +304,7 @@ void SfxNotebookBar::ResetActiveToolbarModeToDefault(vcl::EnumContext::Applicati if ( !aAppNode.isValid() ) return; - aAppNode.setNodeValue( "Active", makeAny( OUString( "Default" ) ) ); + aAppNode.setNodeValue( "Active", Any( OUString( "Default" ) ) ); aAppNode.commit(); } diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 1a4fcd51a9b5..d904b5260420 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -84,15 +84,15 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( aPropValue.Name = "Frame"; aPropValue.Value <<= rxFrame; - aPropertyVector.push_back(makeAny(aPropValue)); + aPropertyVector.push_back(Any(aPropValue)); aPropValue.Name = "ServiceManager"; aPropValue.Value <<= ::comphelper::getProcessServiceFactory(); - aPropertyVector.push_back(makeAny(aPropValue)); + aPropertyVector.push_back(Any(aPropValue)); aPropValue.Name = "CommandURL"; aPropValue.Value <<= rsCommandName; - aPropertyVector.push_back(makeAny(aPropValue)); + aPropertyVector.push_back(Any(aPropValue)); Sequence<Any> aArgs (comphelper::containerToSequence(aPropertyVector)); xInitialization->initialize(aArgs); @@ -193,29 +193,29 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController( aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= sModuleName; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); aPropValue.Name = "Frame"; aPropValue.Value <<= rxFrame; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); aPropValue.Name = "ServiceManager"; aPropValue.Value <<= comphelper::getProcessServiceFactory(); - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); aPropValue.Name = "ParentWindow"; aPropValue.Value <<= rxToolbar; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); aPropValue.Name = "IsSidebar"; aPropValue.Value <<= bSideBar; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); if (nWidth > 0) { aPropValue.Name = "Width"; aPropValue.Value <<= nWidth; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( Any( aPropValue )); } Sequence<Any> aArgs (comphelper::containerToSequence(aPropertyVector)); diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 1906e733db01..00b59df5e221 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -322,9 +322,9 @@ void ResourceManager::SaveDeckSettings(const DeckDescriptor* pDeckDesc) utl::OConfigurationNode aDeckNode (aDeckRootNode.openNode(pDeckDesc->msNodeName)); - css::uno::Any aTitle(makeAny(pDeckDesc->msTitle)); - css::uno::Any aOrder(makeAny(pDeckDesc->mnOrderIndex)); - css::uno::Any aContextList(makeAny(sContextList)); + css::uno::Any aTitle(Any(pDeckDesc->msTitle)); + css::uno::Any aOrder(Any(pDeckDesc->mnOrderIndex)); + css::uno::Any aContextList(sContextList); bool bChanged = false; if (aTitle != aDeckNode.getNodeValue("Title")) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index a1c6c211d794..cff76a95850b 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -975,17 +975,17 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( // Create the XUIElement. ::comphelper::NamedValueCollection aCreationArguments; - aCreationArguments.put("Frame", makeAny(mxFrame)); - aCreationArguments.put("ParentWindow", makeAny(rxWindow)); + aCreationArguments.put("Frame", Any(mxFrame)); + aCreationArguments.put("ParentWindow", Any(rxWindow)); SidebarDockingWindow* pSfxDockingWindow = mpParentWindow.get(); if (pSfxDockingWindow != nullptr) - aCreationArguments.put("SfxBindings", makeAny(reinterpret_cast<sal_uInt64>(&pSfxDockingWindow->GetBindings()))); + aCreationArguments.put("SfxBindings", Any(reinterpret_cast<sal_uInt64>(&pSfxDockingWindow->GetBindings()))); aCreationArguments.put("Theme", Theme::GetPropertySet()); - aCreationArguments.put("Sidebar", makeAny(Reference<ui::XSidebar>(static_cast<ui::XSidebar*>(this)))); + aCreationArguments.put("Sidebar", Any(Reference<ui::XSidebar>(static_cast<ui::XSidebar*>(this)))); if (bWantsCanvas) { Reference<rendering::XSpriteCanvas> xCanvas (VCLUnoHelper::GetWindow(rxWindow)->GetOutDev()->GetSpriteCanvas()); - aCreationArguments.put("Canvas", makeAny(xCanvas)); + aCreationArguments.put("Canvas", Any(xCanvas)); } if (mxCurrentController.is()) @@ -993,13 +993,13 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( OUString aModule = Tools::GetModuleName(mxCurrentController); if (!aModule.isEmpty()) { - aCreationArguments.put("Module", makeAny(aModule)); + aCreationArguments.put("Module", Any(aModule)); } - aCreationArguments.put("Controller", makeAny(mxCurrentController)); + aCreationArguments.put("Controller", Any(mxCurrentController)); } - aCreationArguments.put("ApplicationName", makeAny(rContext.msApplication)); - aCreationArguments.put("ContextName", makeAny(rContext.msContext)); + aCreationArguments.put("ApplicationName", Any(rContext.msApplication)); + aCreationArguments.put("ContextName", Any(rContext.msContext)); Reference<ui::XUIElement> xUIElement( xUIElementFactory->createUIElement( diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 9493a77ff314..1cda4a41ca34 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -208,8 +208,8 @@ IMPL_LINK(ClassificationCategoriesController, SelectHdl, weld::ComboBox&, rCateg const OUString& aType = getCategoryType(); uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({ - {"Name", uno::makeAny(aEntry)}, - {"Type", uno::makeAny(aType)}, + {"Name", uno::Any(aEntry)}, + {"Type", uno::Any(aType)}, })); comphelper::dispatchCommand(".uno:ClassificationApply", aPropertyValues); } diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 12679c3b1cf6..4494e7e7c633 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -458,9 +458,9 @@ void SfxClassificationHelper::Impl::pushToDocumentProperties() try { if (lcl_containsProperty(aProperties, rLabel.first)) - xPropertySet->setPropertyValue(rLabel.first, uno::makeAny(rLabel.second)); + xPropertySet->setPropertyValue(rLabel.first, uno::Any(rLabel.second)); else - xPropertyContainer->addProperty(rLabel.first, beans::PropertyAttribute::REMOVABLE, uno::makeAny(rLabel.second)); + xPropertyContainer->addProperty(rLabel.first, beans::PropertyAttribute::REMOVABLE, uno::Any(rLabel.second)); } catch (const uno::Exception&) { diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 92b763327ea9..0c3f39b9efd8 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -256,7 +256,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() try { xStatusIndicator = xStatusIndicatorFactory->createStatusIndicator(); - xPropSet->setPropertyValue( "IndicatorInterception" , uno::makeAny( xStatusIndicator )); + xPropSet->setPropertyValue( "IndicatorInterception" , uno::Any( xStatusIndicator )); } catch ( const uno::RuntimeException& ) { @@ -285,7 +285,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() if ( xPropSet.is() ) { xStatusIndicator.clear(); - xPropSet->setPropertyValue( "IndicatorInterception" , uno::makeAny( xStatusIndicator )); + xPropSet->setPropertyValue( "IndicatorInterception" , uno::Any( xStatusIndicator )); } } catch ( const uno::RuntimeException& ) diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 9760b6802cb7..23856a34401b 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1192,7 +1192,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLayouterProps( xFrameProps->getPropertyValue("LayoutManager"), uno::UNO_QUERY_THROW ); - xLayouterProps->setPropertyValue("PreserveContentSize", uno::makeAny( true ) ); + xLayouterProps->setPropertyValue("PreserveContentSize", uno::Any( true ) ); } catch (const uno::Exception&) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index bbf1a679dd4a..88d9d269b5f3 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -748,7 +748,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), nullptr ); if (xHdl.is()) - pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) ); + pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::Any(xHdl)) ); } if (!pMacroExecItem) @@ -2323,7 +2323,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const SfxInterfaceId i_nNewViewId ) } // then replace it with the most recent view data we just obtained - xViewData->insertByIndex( 0, makeAny( aViewData ) ); + xViewData->insertByIndex( 0, Any( aViewData ) ); } catch( const Exception& ) { @@ -3099,7 +3099,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { xLMPropSet->setPropertyValue( "HideCurrentUI", - makeAny( bNewFullScreenMode )); + Any( bNewFullScreenMode )); } catch ( css::beans::UnknownPropertyException& ) { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 5a850d355a5d..975dad2a6f2b 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -161,9 +161,9 @@ SfxPrinterController::SfxPrinterController( const VclPtr<Printer>& i_rPrinter, } // set some job parameters - setValue( "IsApi", makeAny( i_bApi ) ); - setValue( "IsDirect", makeAny( i_bDirect ) ); - setValue( "IsPrinter", makeAny( true ) ); + setValue( "IsApi", Any( i_bApi ) ); + setValue( "IsDirect", Any( i_bDirect ) ); + setValue( "IsPrinter", Any( true ) ); setValue( "View", i_rViewProp ); } @@ -577,8 +577,8 @@ void SfxViewShell::StartPrint( const uno::Sequence < beans::PropertyValue >& rPr aSelection = xSupplier->getSelection(); else aSelection <<= GetObjectShell()->GetModel(); - Any aComplete( makeAny( GetObjectShell()->GetModel() ) ); - Any aViewProp( makeAny( xController ) ); + Any aComplete( Any( GetObjectShell()->GetModel() ) ); + Any aViewProp( xController ); VclPtr<Printer> aPrt; const beans::PropertyValue* pVal = std::find_if(rProps.begin(), rProps.end(), @@ -605,7 +605,7 @@ void SfxViewShell::StartPrint( const uno::Sequence < beans::PropertyValue >& rPr SfxObjectShell *pObjShell = GetObjectShell(); xNewController->setValue( "JobName", - makeAny( pObjShell->GetTitle(1) ) ); + Any( pObjShell->GetTitle(1) ) ); xNewController->setPrinterModified( mbPrinterSettingsModified ); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index e1f82e36a11d..8bbdfa61f412 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -255,8 +255,8 @@ static OUString impl_retrieveFilterNameFromTypeAndModule( { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery { - { "Type", css::uno::makeAny( rType ) }, - { "DocumentService", css::uno::makeAny( rModuleIdentifier ) } + { "Type", css::uno::Any( rType ) }, + { "DocumentService", css::uno::Any( rModuleIdentifier ) } }; css::uno::Reference< css::container::XEnumeration > xEnumeration = |