diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 12:02:34 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 14:39:24 +0200 |
commit | 5c1c4402809eebb092f9bba812fa0b07a3196343 (patch) | |
tree | 41e7430d4021619813efa1d07151513fb0f7e8be | |
parent | 562499b75abf465ad15b4c7eac73616a6bf137b5 (diff) |
Just use Any ctor instead of makeAny in embeddedobj
Change-Id: I7e00a4b17b9fc3ccfb360ae5737d253a7d31d02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133819
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 78f73b88a5a6..ee1a8dfa6ad1 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -144,7 +144,7 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& pTargetProps[nInd-1].Value <<= xSourceDisp; } - xTargetMenu->insertByIndex( nTargetIndex, uno::makeAny( aTargetProps ) ); + xTargetMenu->insertByIndex( nTargetIndex, uno::Any( aTargetProps ) ); } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index b3e4db405015..6a3f4e9264e7 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -286,7 +286,7 @@ bool OleEmbeddedObject::TryToConvertToOOo( const uno::Reference< io::XStream >& { // create the model uno::Sequence< uno::Any > aArguments{ uno::Any( - beans::NamedValue( "EmbeddedObject", uno::makeAny( true ))) }; + beans::NamedValue( "EmbeddedObject", uno::Any( true ))) }; uno::Reference< util::XCloseable > xDocument( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aDocServiceName, aArguments, m_xContext ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 4394486c21b2..86403f41bb3e 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -188,7 +188,7 @@ static OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimiz static void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const OUString& aMediaType ) { uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue("MediaType", uno::makeAny( aMediaType ) ); + xPropSet->setPropertyValue("MediaType", uno::Any( aMediaType ) ); } #endif @@ -196,7 +196,7 @@ static void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream > { uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY_THROW ); xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption", - uno::makeAny( true ) ); + uno::Any( true ) ); } #ifdef _WIN32 @@ -485,9 +485,9 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea // insert the result file as replacement image OUString aCacheName = "\002OlePres000"; if ( xNameContainer->hasByName( aCacheName ) ) - xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) ); + xNameContainer->replaceByName( aCacheName, uno::Any( xTempFile ) ); else - xNameContainer->insertByName( aCacheName, uno::makeAny( xTempFile ) ); + xNameContainer->insertByName( aCacheName, uno::Any( xTempFile ) ); uno::Reference< embed::XTransactedObject > xTransacted( xNameContainer, uno::UNO_QUERY_THROW ); xTransacted->commit(); |