diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/desktopcontext.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/opencl.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_update.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/migration/migration.cxx | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 2f2e1d4c4af4..6e91d8622eaf 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -43,7 +43,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) if ( Name == JAVA_INTERACTION_HANDLER_NAME ) { #if HAVE_FEATURE_JAVA - retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) ); + retVal <<= Reference< XInteractionHandler >( new svt::JavaInteractionHandler()); #endif } else if( m_xNextContext.is() ) diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index d4ddee4a2683..55a2dceef234 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -58,7 +58,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r css::uno::Sequence< css::beans::PropertyValue > aArgs(1); aArgs[0].Name = "Hidden"; - aArgs[0].Value = makeAny(true); + aArgs[0].Value <<= true; xComponent.set(xLoader->loadComponentFromURL(rURL, "_blank", 0, aArgs)); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index fc3a079b48d5..6e2c62621d41 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -820,10 +820,10 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, beans::PropertyValue aProperty; aProperty.Name = "nodepath"; - aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") ); + aProperty.Value <<= OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob"); uno::Sequence< uno::Any > aArgumentList( 1 ); - aArgumentList[0] = uno::makeAny( aProperty ); + aArgumentList[0] <<= aProperty; uno::Reference< container::XNameAccess > xNameAccess( xConfigProvider->createInstanceWithArguments( @@ -847,10 +847,10 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, { uno::Sequence< beans::PropertyValue > aPropList(2); aProperty.Name = "updateList"; - aProperty.Value = uno::makeAny( rItemList ); + aProperty.Value <<= rItemList; aPropList[0] = aProperty; aProperty.Name = "prepareOnly"; - aProperty.Value = uno::makeAny( bPrepareOnly ); + aProperty.Value <<= bPrepareOnly; aPropList[1] = aProperty; xDispatch->dispatch(aURL, aPropList ); diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 405e4d4ec4a6..f20da27e0d5a 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -75,7 +75,7 @@ getUpdateInformation( Reference<deployment::XUpdateInformationProvider > const & out_error = e.Reason; } catch (const ucb::CommandAbortedException &) { } catch (const uno::Exception & e) { - out_error = uno::makeAny(e); + out_error <<= e; } return Sequence<Reference< xml::dom::XElement > >(); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 9061aeab34c8..570ff2244444 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -862,10 +862,10 @@ void MigrationImpl::runServices() { // Build argument array uno::Sequence< uno::Any > seqArguments(3); - seqArguments[0] = uno::makeAny(NamedValue("Productname", - uno::makeAny(m_aInfo.productname))); - seqArguments[1] = uno::makeAny(NamedValue("UserData", - uno::makeAny(m_aInfo.userdata))); + seqArguments[0] <<= NamedValue("Productname", + uno::makeAny(m_aInfo.productname)); + seqArguments[1] <<= NamedValue("UserData", + uno::makeAny(m_aInfo.userdata)); // create an instance of every migration service @@ -884,8 +884,8 @@ void MigrationImpl::runServices() if ( nSize > 0 ) seqExtBlackList = comphelper::arrayToSequence< OUString >( &i_mig->excludeExtensions[0], nSize ); - seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList", - uno::makeAny( seqExtBlackList ))); + seqArguments[2] <<= NamedValue("ExtensionBlackList", + uno::makeAny( seqExtBlackList )); xMigrationJob.set( xContext->getServiceManager()->createInstanceWithArgumentsAndContext(i_mig->service, seqArguments, xContext), |