makeAny->Any in canvas..configmgr

Change-Id: Id06812595f373cd0da8b421dbac34a60a266ae6e
Reviewed-on: https://gerrit.libreoffice.org/33869
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 23 insertions, 23 deletions

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index f0e5709642bf..b495850d7773 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -495,8 +495,8 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
             if ( bCopy )
             {
                 auto aObjArgs(::comphelper::InitPropertySequence({
-                    { "SourceShellID", uno::makeAny(rSrcShellID) },
-                    { "DestinationShellID", uno::makeAny(rDestShellID) }
+                    { "SourceShellID", uno::Any(rSrcShellID) },
+                    { "DestinationShellID", uno::Any(rDestShellID) }
                 }));
                 xPersist->storeToEntry(pImpl->mxStorage, rName, aSeq, aObjArgs);
             }
@@ -567,7 +567,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
             // Probably introducing of such an object must be restricted ( a storage must be used! ).
             uno::Reference< beans::XPropertySet > xProps( xNewStream, uno::UNO_QUERY_THROW );
             xProps->setPropertyValue("MediaType",
-                    uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) );
+                    uno::Any( OUString( "application/vnd.sun.star.oleobject" ) ) );
         }
         catch (uno::Exception const& e)
         {
@@ -996,7 +996,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
                     uno::Reference< beans::XPropertySet > xTargetStorProps(
                                                                 pImpl->mpTempObjectContainer->pImpl->mxStorage,
                                                                 uno::UNO_QUERY_THROW );
-                    xTargetStorProps->setPropertyValue( s_sMediaType,uno::makeAny( aOrigStorMediaType ) );
+                    xTargetStorProps->setPropertyValue( s_sMediaType,uno::Any( aOrigStorMediaType ) );
                 }
                 catch (const uno::Exception&)
                 {
@@ -1159,11 +1159,11 @@ bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < c
             throw uno::RuntimeException();
 
         xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
-                                    uno::makeAny( true ) );
+                                    uno::Any( true ) );
         xPropSet->setPropertyValue("MediaType", uno::Any(rMediaType) );
 
         xPropSet->setPropertyValue("Compressed",
-                                    uno::makeAny( true ) );
+                                    uno::Any( true ) );
     }
     catch (const uno::Exception&)
     {
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 06b23432bbe9..6272c46827e3 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -315,7 +315,7 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even
                 {
                     throw css::lang::WrappedTargetRuntimeException(
                         "wrapped CannotConvertException " + e.Message,
-                        css::uno::Reference<css::uno::XInterface>(), makeAny(e));
+                        css::uno::Reference<css::uno::XInterface>(), Any(e));
                 }
             }
         }
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index a28fea7b7f11..77f712c8d080 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -446,9 +446,9 @@ namespace comphelper
             m_xChildMapper->handleChildNotification( _rEvent );
 
             if ( aTranslatedEvent.NewValue == m_xInner )
-                aTranslatedEvent.NewValue = makeAny(aTranslatedEvent.Source);
+                aTranslatedEvent.NewValue <<= aTranslatedEvent.Source;
             if ( aTranslatedEvent.OldValue == m_xInner )
-                aTranslatedEvent.OldValue = makeAny(aTranslatedEvent.Source);
+                aTranslatedEvent.OldValue <<= aTranslatedEvent.Source;
         }
 
         notifyTranslatedEvent( aTranslatedEvent );
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 6da6926daeeb..241899b9014e 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -43,21 +43,21 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     // set root path
     aParam.Name    = "nodepath";
     aParam.Value <<= sPackage;
-    lParams.push_back(css::uno::makeAny(aParam));
+    lParams.push_back(css::uno::Any(aParam));
 
     // enable all locales mode
     if (eMode & EConfigurationModes::AllLocales)
     {
         aParam.Name    = "locale";
         aParam.Value <<= OUString("*");
-        lParams.push_back(css::uno::makeAny(aParam));
+        lParams.push_back(css::uno::Any(aParam));
     }
 
     // enable lazy writing
     bool bLazy(eMode & EConfigurationModes::LazyWrite);
     aParam.Name    = "lazywrite";
-    aParam.Value   = css::uno::makeAny(bLazy);
-    lParams.push_back(css::uno::makeAny(aParam));
+    aParam.Value   <<= bLazy;
+    lParams.push_back(css::uno::Any(aParam));
 
     // open it
     css::uno::Reference< css::uno::XInterface > xCFG;
@@ -132,7 +132,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode
         css::uno::Reference< css::lang::XSingleServiceFactory > xNodeFactory(xSet, css::uno::UNO_QUERY_THROW);
         xNode = xNodeFactory->createInstance();
         css::uno::Reference< css::container::XNameContainer > xSetReplace(xSet, css::uno::UNO_QUERY_THROW);
-        xSetReplace->insertByName(sSetNode, css::uno::makeAny(xNode));
+        xSetReplace->insertByName(sSetNode, css::uno::Any(xNode));
     }
 
     return xNode;
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index ad21ae645199..ef41ce364b50 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -229,7 +229,7 @@ OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString
         try
         {
             // make query for all types matching the properties
-            uno::Sequence < beans::NamedValue > aSeq { { "MediaType", css::uno::makeAny(aMediaType) } };
+            uno::Sequence < beans::NamedValue > aSeq { { "MediaType", css::uno::Any(aMediaType) } };
 
             uno::Reference < container::XEnumeration > xEnum = xTypeCFG->createSubSetEnumerationByProperties( aSeq );
             while ( xEnum->hasMoreElements() )
@@ -719,8 +719,8 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
 
             uno::Sequence< beans::NamedValue > aSearchRequest
             {
-                { "DocumentService", css::uno::makeAny(aServiceName) },
-                { "FileFormatVersion", css::uno::makeAny(nVersion) }
+                { "DocumentService", css::uno::Any(aServiceName) },
+                { "FileFormatVersion", css::uno::Any(nVersion) }
             };
 
             uno::Reference< container::XEnumeration > xFilterEnum =
@@ -801,8 +801,8 @@ OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUStrin
                     {
                         uno::Sequence< beans::NamedValue > aSearchRequest
                         {
-                            { "Type", css::uno::makeAny(aTypeName) },
-                            { "DocumentService", css::uno::makeAny(aDocumentServiceName) }
+                            { "Type", css::uno::Any(aTypeName) },
+                            { "DocumentService", css::uno::Any(aDocumentServiceName) }
                         };
 
                         uno::Sequence< beans::PropertyValue > aExportFilterProps = SearchForFilter(
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index fb964292d463..977d8e8cbacd 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -75,7 +75,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb
             SAL_WARN("comphelper", "getNumberFormatDecimals : invalid key! (may be created with another formatter ?)");
         }
     }
-    return css::uno::makeAny((sal_Int16)0);
+    return css::uno::Any((sal_Int16)0);
 }
 
 
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 999c89c2b42d..b1d70c675fb7 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -183,9 +183,9 @@ const css::uno::Any SequenceAsHashMap::getAsConstAny(bool bAsPropertyValueList)
 {
     css::uno::Any aDestination;
     if (bAsPropertyValueList)
-        aDestination = css::uno::makeAny(getAsConstPropertyValueList());
+        aDestination = css::uno::Any(getAsConstPropertyValueList());
     else
-        aDestination = css::uno::makeAny(getAsConstNamedValueList());
+        aDestination = css::uno::Any(getAsConstNamedValueList());
     return aDestination;
 }
 
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 35c6a5f9f917..2a7dd2d52537 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -623,7 +623,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         {
             OPropertyArrayAggregationHelper::PropertyOrigin ePropOrg = rPH.classifyProperty( *pNames );
             if ( OPropertyArrayAggregationHelper::PropertyOrigin::Unknown == ePropOrg )
-                throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) );
+                throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), Any( UnknownPropertyException( ) ) );
                 // due to a flaw in the API design, this method is not allowed to throw an UnknownPropertyException
                 // so we wrap it into a WrappedTargetException