Just use Any ctor instead of makeAny in connectivity

Change-Id: I68e7354f094ee0e673d105dd8770a658810703d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133838
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

53 files changed, 174 insertions, 183 deletions

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 85da5fba30b3..4ac0235ac4e4 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2285,11 +2285,11 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
             (*this) = _rValueSource.getLong();
         break;
     case DataType::CLOB:
-        (*this) = css::uno::makeAny(_rValueSource.getClob());
+        (*this) = css::uno::Any(_rValueSource.getClob());
         setTypeKind(DataType::CLOB);
         break;
     case DataType::BLOB:
-        (*this) = css::uno::makeAny(_rValueSource.getBlob());
+        (*this) = css::uno::Any(_rValueSource.getBlob());
         setTypeKind(DataType::BLOB);
         break;
     case DataType::OTHER:
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index ab16752677b5..1a73a349b479 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -236,7 +236,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
                 OUString sName = xRow->getString(nColumn);
                 if ( !m_pElements->exists(sName) ) // this name wasn't inserted yet so it must be the new one
                 {
-                    descriptor->setPropertyValue( rPropMap.getNameByIndex( PROPERTY_ID_NAME ), makeAny( sName ) );
+                    descriptor->setPropertyValue( rPropMap.getNameByIndex( PROPERTY_ID_NAME ), Any( sName ) );
                     sNewName = sName;
                     break;
                 }
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 210c618d6a60..52bbf2104b10 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -50,7 +50,7 @@ namespace dbtools
 
         try
         {
-            xProps->setPropertyValue( ACTIVE_CONNECTION_PROPERTY_NAME, makeAny( _rxConnection ) );
+            xProps->setPropertyValue( ACTIVE_CONNECTION_PROPERTY_NAME, Any( _rxConnection ) );
             m_xOriginalConnection = _rxConnection;
             startPropertyListening( xProps );
         }
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ce6f3a6a03ba..7f6f5fb177c5 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -278,7 +278,7 @@ static Reference< XConnection > getConnection_allowException(
         Reference<XInitialization> xIni(xDataSource, UNO_QUERY);
         if (xIni.is())
         {
-            Sequence< Any > aArgs{ Any(NamedValue( "ParentWindow", makeAny(_rxParent) )) };
+            Sequence< Any > aArgs{ Any(NamedValue( "ParentWindow", Any(_rxParent) )) };
             xIni->initialize(aArgs);
         }
 
@@ -316,7 +316,7 @@ static Reference< XConnection > getConnection_allowException(
 
         if (xIni.is())
         {
-            Sequence< Any > aArgs{ Any(NamedValue( "ParentWindow", makeAny(Reference<XWindow>()) )) };
+            Sequence< Any > aArgs{ Any(NamedValue( "ParentWindow", Any(Reference<XWindow>()) )) };
             xIni->initialize(aArgs);
         }
 
@@ -380,7 +380,7 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet,
             ||  ( xExistingConn = findConnection( _rxRowSet ) ).is()
             )
         {
-            xRowSetProps->setPropertyValue("ActiveConnection", makeAny( xExistingConn ) );
+            xRowSetProps->setPropertyValue("ActiveConnection", Any( xExistingConn ) );
             // no auto disposer needed, since we did not create the connection
 
             xConnection.reset( xExistingConn, SharedConnection::NoTakeOwnership );
@@ -425,8 +425,8 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet,
                 if (!sUser.isEmpty())
                 {   // use user and pwd together with the url
                     auto aInfo(::comphelper::InitPropertySequence({
-                        { "user", makeAny(sUser) },
-                        { "password", makeAny(sPwd) }
+                        { "user", Any(sUser) },
+                        { "password", Any(sPwd) }
                     }));
                     xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo );
                 }
@@ -453,7 +453,7 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet,
                 else
                     xRowSetProps->setPropertyValue(
                         "ActiveConnection",
-                        makeAny( xConnection.getTyped() )
+                        Any( xConnection.getTyped() )
                     );
             }
             catch(Exception&)
@@ -683,7 +683,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                     try
                     {
                         if ( xStatementProps.is() )
-                            xStatementProps->setPropertyValue( "MaxRows",  makeAny( sal_Int32( 0 ) ) );
+                            xStatementProps->setPropertyValue( "MaxRows",  Any( sal_Int32( 0 ) ) );
                     }
                     catch( const Exception& )
                     {
@@ -743,7 +743,7 @@ SQLException prependErrorInfo( const SQLException& _rChainedException, const Ref
 {
     return SQLException( _rAdditionalError, _rxContext,
         _eSQLState == StandardSQLState::ERROR_UNSPECIFIED ? OUString() : getStandardSQLState( _eSQLState ),
-        0, makeAny( _rChainedException ) );
+        0, Any( _rChainedException ) );
 }
 
 namespace
@@ -1058,13 +1058,13 @@ try
             {   // (to convert an OUString into a date will not always succeed, because it might be bound to a text-column,
                 // but we can work with a double)
                 Date aDate = DBTypeConversion::toDate(getDouble(aEffectiveDefault));
-                xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate));
+                xNewProps->setPropertyValue(sPropDefaultDate, Any(aDate));
             }
 
             if (hasProperty(sPropDefaultTime, xNewProps) && !bIsString)
             {   // Completely analogous to time
                 css::util::Time aTime = DBTypeConversion::toTime(getDouble(aEffectiveDefault));
-                xNewProps->setPropertyValue(sPropDefaultTime, makeAny(aTime));
+                xNewProps->setPropertyValue(sPropDefaultTime, Any(aTime));
             }
 
             if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), xNewProps) && !bIsString)
@@ -1134,7 +1134,7 @@ try
                 nKey = xFormats->addNew(sNewFormat, _rLocale);
             }
 
-            xNewProps->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FORMATKEY), makeAny(nKey));
+            xNewProps->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FORMATKEY), Any(nKey));
         }
 
         // min-/max-Value
@@ -1713,7 +1713,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
     Reference<XIndexAccess> xWrappedParameters = new OParameterWrapper(std::move(aNewParameterSet),xParamsAsIndicies);
     aRequest.Parameters = xWrappedParameters;
     aRequest.Connection = _xConnection;
-    rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest(makeAny(aRequest));
+    rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest(Any(aRequest));
     // some knittings
     pRequest->addContinuation(pAbort);
     pRequest->addContinuation(pParams);
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 74d427d248a9..b6a4a48754d9 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -814,7 +814,7 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
     {
         ::utl::SharedUNOComponent< XStatement > xStmt( _xConnection->createStatement() );
         Reference< XPropertySet > xStatementProps( xStmt, UNO_QUERY_THROW );
-        xStatementProps->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ESCAPEPROCESSING ), makeAny( false ) );
+        xStatementProps->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ESCAPEPROCESSING ), Any( false ) );
         Reference< XResultSet > xResult( xStmt->executeQuery( sSelect ), UNO_SET_THROW );
         Reference< XResultSetMetaDataSupplier > xSuppMeta( xResult, UNO_QUERY_THROW );
         Reference< XResultSetMetaData > xMeta( xSuppMeta->getMetaData(), UNO_SET_THROW );
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index ee39aa87830e..07d93984f30a 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -49,7 +49,7 @@ namespace dbtools
         OSL_ENSURE( m_xComponentAggregate.is(), "FilterManager::initialize: invalid arguments!" );
 
         if ( m_xComponentAggregate.is() )
-            m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_APPLYFILTER), makeAny( true ) );
+            m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_APPLYFILTER), Any( true ) );
     }
 
 
@@ -108,14 +108,14 @@ namespace dbtools
                     [[fallthrough]];
                 case FilterComponent::LinkFilter:
                     if (propagate)
-                        m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), makeAny( getComposedFilter() ) );
+                        m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), Any( getComposedFilter() ) );
                     break;
                 case FilterComponent::PublicHaving:
                     propagate = propagate && m_bApplyPublicFilter;
                     [[fallthrough]];
                 case FilterComponent::LinkHaving:
                     if (propagate)
-                        m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), makeAny( getComposedHaving() ) );
+                        m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), Any( getComposedHaving() ) );
                     break;
                 }
             }
@@ -140,9 +140,9 @@ namespace dbtools
             {
                 // only where/if something changed
                 if (!getFilterComponent( FilterComponent::PublicFilter ).isEmpty())
-                    m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), makeAny( getComposedFilter() ) );
+                    m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), Any( getComposedFilter() ) );
                 if (!getFilterComponent( FilterComponent::PublicHaving ).isEmpty())
-                    m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), makeAny( getComposedHaving() ) );
+                    m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HAVINGCLAUSE), Any( getComposedHaving() ) );
             }
         }
         catch( const Exception& )
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 117282fbd7f3..c18fc2831ff3 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -650,7 +650,7 @@ namespace dbtools
         ParametersRequest aRequest;
         aRequest.Parameters = m_pOuterParameters.get();
         aRequest.Connection = _rxConnection;
-        rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest( makeAny( aRequest ) );
+        rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest( Any( aRequest ) );
 
         // some knittings
         pRequest->addContinuation( pAbort );
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 8616277c7ddf..aab6daa243d1 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -313,7 +313,7 @@ namespace dbtools::param
         if ( ( _nIndex < 0 ) || ( _nIndex >= static_cast<sal_Int32>(m_aParameters.size()) ) )
             throw IndexOutOfBoundsException();
 
-        return makeAny( Reference< XPropertySet >( m_aParameters[ _nIndex ] ) );
+        return Any( Reference< XPropertySet >( m_aParameters[ _nIndex ] ) );
     }
 
 
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 733bf5b4a450..ba7825612519 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -61,19 +61,19 @@ namespace dbtools
 
     void WarningsContainer::appendWarning(const SQLException& _rWarning)
     {
-        lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
+        lcl_concatWarnings( m_aOwnWarnings, Any( _rWarning ) );
     }
 
 
     void WarningsContainer::appendWarning( const SQLContext& _rContext )
     {
-        lcl_concatWarnings( m_aOwnWarnings, makeAny( _rContext ));
+        lcl_concatWarnings( m_aOwnWarnings, Any( _rContext ));
     }
 
 
     void WarningsContainer::appendWarning(const SQLWarning& _rWarning)
     {
-        lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
+        lcl_concatWarnings( m_aOwnWarnings, Any( _rWarning ) );
     }
 
 
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 1f5bd030203c..ba17e6fea42a 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -295,7 +295,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
                             const OUString& _rPath)
 {
     OSL_ASSERT(_rxConfProvider.is());
-    Sequence< Any > args{ Any(NamedValue( "nodepath", makeAny(_rPath))) };
+    Sequence< Any > args{ Any(NamedValue( "nodepath", Any(_rPath))) };
     Reference< XInterface > xInterface(
         _rxConfProvider->createInstanceWithArguments(
             "com.sun.star.configuration.ConfigurationAccess",
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index ad90d8d05556..6568f7a1ee84 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -230,7 +230,7 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >&
                 else
                 {
                     SQLException aTemp(aErr.GetDescription(),
-                        _xInterface,aErr.GetSQLState(),aErr.GetNumber(),makeAny(aException));
+                        _xInterface,aErr.GetSQLState(),aErr.GetNumber(),Any(aException));
                     aTemp.NextException <<= aException;
                     aException = aTemp;
                 }
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index b30e8fe8c64f..85ca2b081a07 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -818,12 +818,12 @@ Any SAL_CALL OResultSet::getBookmark(  )
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
     if(m_nRowPos < static_cast<sal_Int32>(m_aBookmarks.size())) // this bookmark was already fetched
-        return makeAny(sal_Int32(m_nRowPos-1));
+        return Any(sal_Int32(m_nRowPos-1));
 
     OLEVariant aVar;
     m_pRecordSet->get_Bookmark(&aVar);
     m_aBookmarks.push_back(aVar);
-    return makeAny(static_cast<sal_Int32>(m_aBookmarks.size()-1));
+    return Any(static_cast<sal_Int32>(m_aBookmarks.size()-1));
 
 }
 
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 010bad4131db..1c48734d84fb 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -470,7 +470,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  )
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-    return makeAny(m_aLastWarning);
+    return Any(m_aLastWarning);
 }
 
 
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 3299181c5ef1..234a41fa59cd 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -93,7 +93,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
     insertElement(_rsNewTable,nullptr);
 
     // notify our container listeners
-    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rsNewTable), Any(), Any());
+    ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_rsNewTable), Any(), Any());
     OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
         aListenerLoop.next()->elementInserted(aEvent);
diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx
index acf5d6a74df8..08e6e04aca70 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -77,7 +77,7 @@ Any SAL_CALL OComponentResultSet::getBookmark(  )
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-    return makeAny((*m_aRow)[0]->getValue().getInt32());
+    return Any((*m_aRow)[0]->getValue().getInt32());
 }
 
 sal_Bool SAL_CALL OComponentResultSet::moveToBookmark( const  Any& bookmark )
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 3533477bb0cf..47b898ada4e2 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -81,7 +81,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark(  )
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getBookmark called for deleted row");
 
-    return makeAny((*m_aRow)[0]->getValue().getInt32());
+    return Any((*m_aRow)[0]->getValue().getInt32());
 }
 
 sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark )
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index a7bed6e53642..1f942ad08e1c 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1455,7 +1455,7 @@ bool ODbaseTable::Drop_Static(std::u16string_view _sUrl, bool _bHasMemoFields, O
             try
             {
                 ::ucbhelper::Content aDeleteContent( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() );
-                aDeleteContent.executeCommand( "delete", makeAny( true ) );
+                aDeleteContent.executeCommand( "delete", Any( true ) );
             }
             catch(const Exception&)
             {
@@ -2193,7 +2193,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
 
         rtl::Reference<ODbaseTable> pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
         Reference<XPropertySet> xHoldTable = pNewTable;
-        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sTempName));
+        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),Any(sTempName));
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         OSL_ENSURE(xAppend.is(),"ODbaseTable::alterColumn: No XAppend interface!");
 
@@ -2335,7 +2335,7 @@ namespace
                                                 Any(sNewName),
                                                 css::beans::PropertyState_DIRECT_VALUE } };
             Sequence< Any > aValues;
-            aContent.executeCommand( "setPropertyValues",makeAny(aProps) ) >>= aValues;
+            aContent.executeCommand( "setPropertyValues",Any(aProps) ) >>= aValues;
             if(aValues.hasElements() && aValues[0].hasValue())
                 throw Exception("setPropertyValues returned non-zero", nullptr);
         }
@@ -2365,7 +2365,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
     OUString sTempName = createTempFile();
 
     rtl::Reference xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection)));
-    xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sTempName));
+    xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),Any(sTempName));
     {
         Reference<XAppend> xAppend(xNewTable->getColumns(),UNO_QUERY);
         bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
@@ -2423,7 +2423,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     OUString sTempName = createTempFile();
 
     rtl::Reference xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection)));
-    xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sTempName));
+    xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),Any(sTempName));
     {
         Reference<XAppend> xAppend(xNewTable->getColumns(),UNO_QUERY);
         bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index a3bc953d93b4..8f63263c1752 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -68,7 +68,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const R
     auto pTable = comphelper::getFromUnoTunnel<ODbaseTable>(descriptor);
     if(pTable)
     {
-        pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(_rForName));
+        pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),Any(_rForName));
         try
         {
             if(!pTable->CreateImpl())
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index e0ea8bc59aef..d32ac0ed22e1 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -193,7 +193,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  )
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
-    return makeAny(m_aLastWarning);
+    return Any(m_aLastWarning);
 }
 
 void SAL_CALL OStatement_Base::clearWarnings(  )
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index 6914a2faf847..936e1465cb10 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -218,7 +218,7 @@ void connectivity::firebird::Tables::appendNew(const OUString& _rsNewTable)
 
     // notify our container listeners
     css::container::ContainerEvent aEvent(static_cast<XContainer*>(this),
-                                          css::uno::makeAny(_rsNewTable), css::uno::Any(),
+                                          css::uno::Any(_rsNewTable), css::uno::Any(),
                                           css::uno::Any());
     comphelper::OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 2e8c2a391d97..9d1975c77e45 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -96,7 +96,7 @@ Any SAL_CALL OFlatResultSet::getBookmark(  )
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
-    return makeAny((*m_aRow)[0]->getValue().getInt32());
+    return Any((*m_aRow)[0]->getValue().getInt32());
 }
 
 sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark )
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 283fdf66885c..e108406b7d04 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -236,7 +236,7 @@ namespace connectivity
                 // security: permitted Java classes
                 NamedValue aPermittedClasses(
                     "hsqldb.method_class_names",
-                    makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) )
+                    Any( lcl_getPermittedJavaMethods_nothrow( m_xContext ) )
                 );
                 aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
 
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index fcc50bba4bc5..42ca7b527668 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -259,7 +259,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
 
     rtl::Reference<OHSQLColumn> pColumn = new OHSQLColumn;
     ::comphelper::copyProperties(_xDescriptor,pColumn);
-    pColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
+    pColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),Any(nNewType));
 
     sSql += ::dbtools::createStandardColumnPart(pColumn,getConnection());
     executeStatement(sSql);
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index de818686b49d..de99a3b04e8c 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -160,7 +160,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
     insertElement(_rsNewTable,nullptr);
 
     // notify our container listeners
-    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rsNewTable), Any(), Any());
+    ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_rsNewTable), Any(), Any());
     OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
         aListenerLoop.next()->elementInserted(aEvent);
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 5553b1195d29..19391e60edac 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -530,7 +530,7 @@ Any SAL_CALL java_sql_Connection::getWarnings(  )
         aWarning.ErrorCode = aAsException.ErrorCode;
         aWarning.NextException = aAsException.NextException;
 
-        return makeAny( aWarning );
+        return Any( aWarning );
     }
 
     return Any();
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index bc780fd832cd..c94f0fd68fa9 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -378,7 +378,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings(  )
     if( out )
     {
         java_sql_SQLWarning_BASE        warn_base( t.pEnv, out );
-        return makeAny(
+        return Any(
             static_cast< css::sdbc::SQLException >(
                 java_sql_SQLWarning(warn_base,*static_cast<cppu::OWeakObject*>(this))));
     }
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 0d949db73835..c274c521c33c 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -514,7 +514,7 @@ css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings(  )
     if( out )
     {
         java_sql_SQLWarning_BASE        warn_base( t.pEnv, out );
-        return makeAny(
+        return Any(
             static_cast< css::sdbc::SQLException >(
                 java_sql_SQLWarning(warn_base,*this)));
     }
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 55bf0996c941..9374407d1b53 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -31,7 +31,7 @@ java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE&
                                 _rContext,
                                 _rException.getSQLState(),
                                 _rException.getErrorCode(),
-                                makeAny(_rException.getNextException())
+                                Any(_rException.getNextException())
                             )
 {
 }
diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
index 69d2386990ae..ffe006c4b041 100644
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -158,31 +158,31 @@ Sequence<PropertyValue> lcl_convertProperties(T_DRIVERTYPE _eType,
 
     if (_eType == T_DRIVERTYPE::Odbc)
     {
-        aProps.push_back(PropertyValue("Silent", 0, makeAny(true), PropertyState_DIRECT_VALUE));
-        aProps.push_back(PropertyValue("PreventGetVersionColumns", 0, makeAny(true),
-                                       PropertyState_DIRECT_VALUE));
+        aProps.push_back(PropertyValue("Silent", 0, Any(true), PropertyState_DIRECT_VALUE));
+        aProps.push_back(
+            PropertyValue("PreventGetVersionColumns", 0, Any(true), PropertyState_DIRECT_VALUE));
     }
     else if (_eType == T_DRIVERTYPE::Jdbc)
     {
         if (!jdc)
         {
             aProps.push_back(PropertyValue("JavaDriverClass", 0,
-                                           makeAny(OUString("com.mysql.jdbc.Driver")),
+                                           Any(OUString("com.mysql.jdbc.Driver")),
                                            PropertyState_DIRECT_VALUE));
         }
     }
     else
     {
         aProps.push_back(
-            PropertyValue("PublicConnectionURL", 0, makeAny(_sUrl), PropertyState_DIRECT_VALUE));
+            PropertyValue("PublicConnectionURL", 0, Any(_sUrl), PropertyState_DIRECT_VALUE));
     }
     aProps.push_back(
-        PropertyValue("IsAutoRetrievingEnabled", 0, makeAny(true), PropertyState_DIRECT_VALUE));
+        PropertyValue("IsAutoRetrievingEnabled", 0, Any(true), PropertyState_DIRECT_VALUE));
     aProps.push_back(PropertyValue("AutoRetrievingStatement", 0,
-                                   makeAny(OUString("SELECT LAST_INSERT_ID()")),
+                                   Any(OUString("SELECT LAST_INSERT_ID()")),
                                    PropertyState_DIRECT_VALUE));
     aProps.push_back(
-        PropertyValue("ParameterNameSubstitution", 0, makeAny(true), PropertyState_DIRECT_VALUE));
+        PropertyValue("ParameterNameSubstitution", 0, Any(true), PropertyState_DIRECT_VALUE));
     return Sequence<PropertyValue>(aProps.data(), aProps.size());
 }
 }
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index f769089482a1..3dfdfbdae55e 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
                     {
                         sTypeName += OUString::Concat(" ") + s_sAutoIncrement;
                         descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
-                                                     makeAny(sTypeName));
+                                                     Any(sTypeName));
                     }
                 }
                 else
@@ -210,7 +210,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
                         {
                             sTypeName = sTypeName.copy(0, nIndex);
                             descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
-                                                         makeAny(sTypeName));
+                                                         Any(sTypeName));
                         }
                     }
                 }
@@ -269,7 +269,7 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType, const OUString& _rColName,
     rtl::Reference<OColumn> pColumn = new OColumn(true);
     ::comphelper::copyProperties(_xDescriptor, pColumn);
     pColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
-                              makeAny(nNewType));
+                              Any(nNewType));
 
     sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(
         pColumn, getConnection(), static_cast<OTables*>(m_pTables), getTypeCreatePattern()));
diff --git a/connectivity/source/drivers/mysql_jdbc/YTables.cxx b/connectivity/source/drivers/mysql_jdbc/YTables.cxx
index f1ab3ee1e7b3..c28f8e44ef76 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTables.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTables.cxx
@@ -178,7 +178,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
     insertElement(_rsNewTable, nullptr);
 
     // notify our container listeners
-    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rsNewTable), Any(), Any());
+    ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_rsNewTable), Any(), Any());
     OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
         aListenerLoop.next()->elementInserted(aEvent);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index dd2f9e5dd20c..d56993f89230 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -465,7 +465,7 @@ OUString OConnection::transFormPreparedStatement(const OUString& _sSQL)
         try
         {
             Reference<XConnection> xCon = this;
-            Sequence<Any> aArgs{ Any(NamedValue("ActiveConnection", makeAny(xCon))) };
+            Sequence<Any> aArgs{ Any(NamedValue("ActiveConnection", Any(xCon))) };
 
             m_xParameterSubstitution.set(
                 m_xDriver->getFactory()->createInstanceWithArguments(
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 40d144730f6b..109ae2c1c8e2 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -565,7 +565,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTableTypes()
         if (m_rConnection.getMysqlVersion() >= requiredVersion[i])
         {
             rRows.push_back(
-                { { Any(), makeAny(mysqlc_sdbc_driver::convert(table_types[i], encoding)) } });
+                { { Any(), Any(mysqlc_sdbc_driver::convert(table_types[i], encoding)) } });
         }
     }
     lcl_setRows_throw(xResultSet, 5, rRows);
@@ -585,17 +585,17 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTypeInfo()
     while (mysqlc_types[i].typeName)
     {
         rRows.push_back(
-            { { Any(), makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].typeName, encoding)),
-                makeAny(mysqlc_types[i].dataType), makeAny(mysqlc_types[i].precision),
-                makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalPrefix, encoding)),
-                makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalSuffix, encoding)),
-                makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].createParams, encoding)),
-                makeAny(mysqlc_types[i].nullable), makeAny(mysqlc_types[i].caseSensitive),
-                makeAny(mysqlc_types[i].searchable), makeAny(mysqlc_types[i].isUnsigned),
-                makeAny(mysqlc_types[i].fixedPrecScale), makeAny(mysqlc_types[i].autoIncrement),
-                makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].localTypeName, encoding)),
-                makeAny(mysqlc_types[i].minScale), makeAny(mysqlc_types[i].maxScale),
-                makeAny(sal_Int32(0)), makeAny(sal_Int32(0)), makeAny(sal_Int32(10)) } });
+            { { Any(), Any(mysqlc_sdbc_driver::convert(mysqlc_types[i].typeName, encoding)),
+                Any(mysqlc_types[i].dataType), Any(mysqlc_types[i].precision),
+                Any(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalPrefix, encoding)),
+                Any(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalSuffix, encoding)),
+                Any(mysqlc_sdbc_driver::convert(mysqlc_types[i].createParams, encoding)),
+                Any(mysqlc_types[i].nullable), Any(mysqlc_types[i].caseSensitive),
+                Any(mysqlc_types[i].searchable), Any(mysqlc_types[i].isUnsigned),
+                Any(mysqlc_types[i].fixedPrecScale), Any(mysqlc_types[i].autoIncrement),
+                Any(mysqlc_sdbc_driver::convert(mysqlc_types[i].localTypeName, encoding)),
+                Any(mysqlc_types[i].minScale), Any(mysqlc_types[i].maxScale), Any(sal_Int32(0)),
+                Any(sal_Int32(0)), Any(sal_Int32(10)) } });
 
         i++;
     }
@@ -636,7 +636,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas()
         for (sal_uInt32 i = 1; i <= columns; i++)
         {
             OUString columnStringValue = xRow->getString(i);
-            aRow.push_back(makeAny(columnStringValue));
+            aRow.push_back(Any(columnStringValue));
         }
         rRows.push_back(aRow);
     }
@@ -733,18 +733,18 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
         std::vector<Any> aRow{ Any() }; // 0. element is unused
 
         // catalog name
-        aRow.push_back(makeAny(xRow->getString(1)));
+        aRow.push_back(Any(xRow->getString(1)));
         // schema name
-        aRow.push_back(makeAny(xRow->getString(2)));
+        aRow.push_back(Any(xRow->getString(2)));
         // table name
-        aRow.push_back(makeAny(xRow->getString(3)));
+        aRow.push_back(Any(xRow->getString(3)));
         // column name
-        aRow.push_back(makeAny(xRow->getString(4)));
+        aRow.push_back(Any(xRow->getString(4)));
         // data type
         OUString sDataType = xRow->getString(5);
-        aRow.push_back(makeAny(mysqlc_sdbc_driver::mysqlStrToOOOType(sDataType)));
+        aRow.push_back(Any(mysqlc_sdbc_driver::mysqlStrToOOOType(sDataType)));
         // type name
-        aRow.push_back(makeAny(sDataType)); // TODO
+        aRow.push_back(Any(sDataType)); // TODO
         // column size
         sal_Int32 nColumnSize = 0;
         OUString sColumnType = xRow->getString(14);
@@ -763,34 +763,34 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
             nColumnSize = xRow->getShort(7); // numeric precision
         else
             nColumnSize = nCharMaxLen;
-        aRow.push_back(makeAny(nColumnSize));
+        aRow.push_back(Any(nColumnSize));
         aRow.push_back(Any()); // buffer length - unused
         // decimal digits (scale)
-        aRow.push_back(makeAny(xRow->getShort(8)));
+        aRow.push_back(Any(xRow->getShort(8)));
         // num_prec_radix
-        aRow.push_back(makeAny(sal_Int32(10)));
+        aRow.push_back(Any(sal_Int32(10)));
         // nullable
         OUString sIsNullable = xRow->getString(13);
         if (xRow->wasNull())
-            aRow.push_back(makeAny(ColumnValue::NULLABLE_UNKNOWN));
+            aRow.push_back(Any(ColumnValue::NULLABLE_UNKNOWN));
         else if (sIsNullable.equalsIgnoreAsciiCase("YES"))
-            aRow.push_back(makeAny(ColumnValue::NULLABLE));
+            aRow.push_back(Any(ColumnValue::NULLABLE));
         else
-            aRow.push_back(makeAny(ColumnValue::NO_NULLS));
+            aRow.push_back(Any(ColumnValue::NO_NULLS));
         // remarks
-        aRow.push_back(makeAny(xRow->getString(9)));
+        aRow.push_back(Any(xRow->getString(9)));
         // default
-        aRow.push_back(makeAny(xRow->getString(10)));
+        aRow.push_back(Any(xRow->getString(10)));
 
         aRow.push_back(Any{}); // sql_data_type - unused
         aRow.push_back(Any{}); // sql_datetime_sub - unused
 
         // character octet length
-        aRow.push_back(makeAny(xRow->getString(11)));
+        aRow.push_back(Any(xRow->getString(11)));
         // ordinal position
-        aRow.push_back(makeAny(xRow->getString(12)));
+        aRow.push_back(Any(xRow->getString(12)));
         // is nullable
-        aRow.push_back(makeAny(sIsNullable));
+        aRow.push_back(Any(sIsNullable));
         aRows.push_back(aRow);
     }
     lcl_setRows_throw(xResultSet, 1, aRows);
@@ -929,34 +929,34 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*c
         std::vector<Any> aRow{ Any() }; // 0. element is unused
 
         // primary key catalog
-        aRow.push_back(makeAny(xRow->getString(3)));
+        aRow.push_back(Any(xRow->getString(3)));
         // primary key schema
-        aRow.push_back(makeAny(xRow->getString(4)));
+        aRow.push_back(Any(xRow->getString(4)));
         // primary key table
-        aRow.push_back(makeAny(xRow->getString(5)));
+        aRow.push_back(Any(xRow->getString(5)));
         // primary column name
-        aRow.push_back(makeAny(xRow->getString(6)));
+        aRow.push_back(Any(xRow->getString(6)));
 
         // fk table catalog
-        aRow.push_back(makeAny(xRow->getString(1)));
+        aRow.push_back(Any(xRow->getString(1)));
         // fk schema
-        aRow.push_back(makeAny(xRow->getString(11)));
+        aRow.push_back(Any(xRow->getString(11)));
         // fk table
-        aRow.push_back(makeAny(xRow->getString(10)));
+        aRow.push_back(Any(xRow->getString(10)));
         // fk column name
-        aRow.push_back(makeAny(xRow->getString(2)));
+        aRow.push_back(Any(xRow->getString(2)));
         // KEY_SEQ
-        aRow.push_back(makeAny(sal_Int32{ 0 })); // TODO
+        aRow.push_back(Any(sal_Int32{ 0 })); // TODO
         // update rule
-        aRow.push_back(makeAny(xRow->getShort(7)));
+        aRow.push_back(Any(xRow->getShort(7)));
         // delete rule
-        aRow.push_back(makeAny(xRow->getShort(8)));
+        aRow.push_back(Any(xRow->getShort(8)));
         // foreign key name
-        aRow.push_back(makeAny(xRow->getString(9)));
+        aRow.push_back(Any(xRow->getString(9)));
         // primary key name
-        aRow.push_back(makeAny(OUString{})); // TODO
+        aRow.push_back(Any(OUString{})); // TODO
         // deferrability
-        aRow.push_back(makeAny(Deferrability::NONE));
+        aRow.push_back(Any(Deferrability::NONE));
         aRows.push_back(aRow);
     }
     lcl_setRows_throw(xResultSet, 1, aRows);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index c1da2fe41c9c..ea3783a95c3f 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -282,7 +282,7 @@ Any SAL_CALL OCommonStatement::getWarnings()
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
 
-    return makeAny(m_aLastWarning);
+    return Any(m_aLastWarning);
 }
 
 void SAL_CALL OCommonStatement::clearWarnings()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
index 06218403f3fb..81498978d3a5 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
@@ -124,7 +124,7 @@ void connectivity::mysqlc::Tables::appendNew(const OUString& _rsNewTable)
 
     // notify our container listeners
     css::container::ContainerEvent aEvent(static_cast<XContainer*>(this),
-                                          css::uno::makeAny(_rsNewTable), css::uno::Any(),
+                                          css::uno::Any(_rsNewTable), css::uno::Any(),
                                           css::uno::Any());
     comphelper::OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 507a52d872a2..d5852c9ea407 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -909,7 +909,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
             ));
         SQLException aNext(sError,*this, OUString(),0,Any());
 
-        ::dbtools::throwInvalidIndexException(*this,makeAny(aNext));
+        ::dbtools::throwInvalidIndexException(*this,Any(aNext));
     }
 }
 
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 8a35212a918c..9e68cd1763c2 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -891,7 +891,7 @@ void SAL_CALL OResultSet::insertRow(  )
 
     if(m_pSkipDeletedSet)
     {
-        if(moveToBookmark(makeAny(aBookmark)))
+        if(moveToBookmark(Any(aBookmark)))
         {
             sal_Int32 nRowPos = getDriverPos();
             if ( -1 == m_nRowPos )
@@ -1686,7 +1686,7 @@ bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nO
             TBookmarkPosMap::const_iterator aIter = std::find_if(m_aPosToBookmarks.begin(), m_aPosToBookmarks.end(),
                 [&_nOffset](const TBookmarkPosMap::value_type& rEntry) { return rEntry.second == _nOffset; });
             if (aIter != m_aPosToBookmarks.end())
-                return moveToBookmark(makeAny(aIter->first));
+                return moveToBookmark(Any(aIter->first));
             SAL_WARN( "connectivity.odbc", "Bookmark not found!");
         }
         return false;
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 50ad8679f171..da50e01f1a2b 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -615,7 +615,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  )
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-    return makeAny(m_aLastWarning);
+    return Any(m_aLastWarning);
 }
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index ef8c14e5a9eb..eb90c24ce424 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -80,7 +80,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 
 using com::sun::star::container::XEnumeration;
 using com::sun::star::container::XEnumerationAccess;
@@ -645,7 +644,7 @@ std::vector< Any > parseArray( const OUString & str )
             if( brackets == 0 )
             {
                 if( !current.isEmpty() || doubleQuotedValue )
-                    elements.push_back( makeAny( current.makeStringAndClear() ) );
+                    elements.push_back( Any( current.makeStringAndClear() ) );
             }
             else
             {
@@ -674,7 +673,7 @@ std::vector< Any > parseArray( const OUString & str )
         else if( ',' == c && brackets == 1)
         {
             doubleQuotedValue = false;
-            elements.push_back( makeAny( current.makeStringAndClear() ) );
+            elements.push_back( Any( current.makeStringAndClear() ) );
         }
         else if( isWhitespace( c ) )
         {
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 95c4db003314..6caf1decc6c6 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -61,7 +61,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
@@ -185,25 +184,25 @@ OUString columnMetaData2SDBCX(
     OUString typeName  = xRow->getString( TYPE_NAME );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.NAME, makeAny( name ) );
+        st.NAME, Any( name ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.TYPE, makeAny( xRow->getInt( DATA_TYPE ) ) );
+        st.TYPE, Any( xRow->getInt( DATA_TYPE ) ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.TYPE_NAME, makeAny( typeName ) );
+        st.TYPE_NAME, Any( typeName ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.PRECISION, makeAny( xRow->getInt( COLUMN_SIZE ) ) );
+        st.PRECISION, Any( xRow->getInt( COLUMN_SIZE ) ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.SCALE, makeAny( xRow->getInt( DECIMAL_DIGITS ) ) );
+        st.SCALE, Any( xRow->getInt( DECIMAL_DIGITS ) ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.IS_NULLABLE, makeAny( xRow->getInt( IS_NULLABLE ) ) );
+        st.IS_NULLABLE, Any( xRow->getInt( IS_NULLABLE ) ) );
 
     pBase->setPropertyValue_NoBroadcast_public(
-        st.DEFAULT_VALUE, makeAny( xRow->getString( DEFAULT_VALUE ) ) );
+        st.DEFAULT_VALUE, Any( xRow->getString( DEFAULT_VALUE ) ) );
 
 //     pBase->setPropertyValue_NoBroadcast_public(
 //         st.DESCRIPTION, makeAny( xRow->getString( DESCRIPTION ) ) );
@@ -213,7 +212,7 @@ OUString columnMetaData2SDBCX(
 //             st.HELP_TEXT, makeAny( xRow->getString( DESCRIPTION ) ) );
 //     else // for key columns, etc. ...
     pBase->setPropertyValue_NoBroadcast_public(
-            st.DESCRIPTION, makeAny( xRow->getString( DESCRIPTION ) ) );
+            st.DESCRIPTION, Any( xRow->getString( DESCRIPTION ) ) );
 
 
     // maybe a better criterion than the type name can be found in future
@@ -316,7 +315,7 @@ void Columns::refresh()
 //                     name ) );
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ name ] = columnIndex;
                 ++columnIndex;
             }
@@ -461,7 +460,7 @@ void Columns::appendByDescriptor(
     osl::MutexGuard guard( m_xMutex->GetMutex() );
     Statics & st = getStatics();
     Reference< XPropertySet > past = createDataDescriptor();
-    past->setPropertyValue( st.IS_NULLABLE, makeAny( css::sdbc::ColumnValue::NULLABLE ) );
+    past->setPropertyValue( st.IS_NULLABLE, Any( css::sdbc::ColumnValue::NULLABLE ) );
     alterColumnByDescriptor(
         m_schemaName, m_tableName, m_pSettings, m_origin->createStatement() , past, future  );
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index d2bcf941a68d..993045d3a44d 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -47,7 +47,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
@@ -76,7 +75,7 @@ public:
         const OUString & name,
         const Any & newElement,
         const OUString & oldElement ) :
-        m_event( source, makeAny( name ), newElement, makeAny(oldElement) )
+        m_event( source, Any( name ), newElement, Any(oldElement) )
     {}
 
     virtual void fire( XEventListener * listener ) const override
@@ -97,7 +96,7 @@ public:
         const Reference< XInterface > & source,
         const OUString & name,
         const Any & newElement ) :
-        m_event( source, makeAny( name ), newElement, Any() )
+        m_event( source, Any( name ), newElement, Any() )
     {}
 
     virtual void fire( XEventListener * listener ) const override
@@ -118,7 +117,7 @@ public:
     RemovedBroadcaster(
         const Reference< XInterface > & source,
         const OUString & name) :
-        m_event( source, makeAny( name ), Any(), Any() )
+        m_event( source, Any( name ), Any(), Any() )
     {}
 
     virtual void fire( XEventListener * listener ) const override
@@ -350,10 +349,10 @@ void Container::append(
     }
 
     int index = m_values.size();
-    m_values.push_back( makeAny( descriptor ) );
+    m_values.push_back( Any( descriptor ) );
     m_name2index[name] = index;
 
-    fire( InsertedBroadcaster( *this, name, makeAny( descriptor ) ) );
+    fire( InsertedBroadcaster( *this, name, Any( descriptor ) ) );
 }
 
 void Container::appendByDescriptor(
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 1e0039ecc6e1..841ea98054d9 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -56,7 +56,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
@@ -131,7 +130,7 @@ void IndexColumns::refresh()
 
             columnMetaData2SDBCX( pIndexColumn.get(), xRow );
             pIndexColumn->setPropertyValue_NoBroadcast_public(
-                st.IS_ASCENDING , makeAny( false ) );
+                st.IS_ASCENDING , Any( false ) );
 
             m_values[ index ] <<= prop;
             m_name2index[ columnName ] = index;
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 332a9a9e5311..d027e15b9d3c 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -55,7 +55,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
@@ -149,7 +148,7 @@ void Indexes::refresh()
             pIndex->setPropertyValue_NoBroadcast_public(
                 st.IS_CLUSTERED, Any( isClusterd ) );
             pIndex->setPropertyValue_NoBroadcast_public(
-                st.NAME, makeAny( currentIndexName ) );
+                st.NAME, Any( currentIndexName ) );
 
             std::vector< sal_Int32 > seq = parseIntArray( row->getString( C_COLUMNS ) );
             Sequence< OUString > columnNames(seq.size());
@@ -160,10 +159,10 @@ void Indexes::refresh()
             }
 
             pIndex->setPropertyValue_NoBroadcast_public(
-                st.PRIVATE_COLUMN_INDEXES, makeAny( columnNames ));
+                st.PRIVATE_COLUMN_INDEXES, Any( columnNames ));
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ currentIndexName ] = index;
                 ++index;
             }
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index 6dcbe07d4117..8b62f28423a5 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -52,7 +52,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
@@ -126,11 +125,11 @@ void KeyColumns::refresh()
             if( keyindex < m_foreignColumnNames.getLength() )
             {
                 pKeyColumn->setPropertyValue_NoBroadcast_public(
-                    st.RELATED_COLUMN, makeAny( m_foreignColumnNames[keyindex]) );
+                    st.RELATED_COLUMN, Any( m_foreignColumnNames[keyindex]) );
             }
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ name ] = columnIndex;
                 ++columnIndex;
             }
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 84507202fa9a..0aeb32446abb 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -60,7 +60,7 @@ using osl::MutexGuard;
 
 using css::beans::XPropertySet;
 
-using com::sun::star::uno::makeAny;
+using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 
@@ -156,16 +156,16 @@ void Keys::refresh()
             Reference< css::beans::XPropertySet > prop = pKey;
 
             pKey->setPropertyValue_NoBroadcast_public(
-                st.NAME, makeAny( xRow->getString( 1 ) ) );
+                st.NAME, Any( xRow->getString( 1 ) ) );
             sal_Int32 keyType = string2keytype( xRow->getString(2) );
-            pKey->setPropertyValue_NoBroadcast_public( st.TYPE, makeAny( keyType  ) );
+            pKey->setPropertyValue_NoBroadcast_public( st.TYPE, Any( keyType  ) );
             pKey->setPropertyValue_NoBroadcast_public(
-                st.UPDATE_RULE, makeAny( string2keyrule( xRow->getString(3) ) ) );
+                st.UPDATE_RULE, Any( string2keyrule( xRow->getString(3) ) ) );
             pKey->setPropertyValue_NoBroadcast_public(
-                st.DELETE_RULE, makeAny( string2keyrule( xRow->getString(4) ) ) );
+                st.DELETE_RULE, Any( string2keyrule( xRow->getString(4) ) ) );
             pKey->setPropertyValue_NoBroadcast_public(
                 st.PRIVATE_COLUMNS,
-                makeAny(
+                Any(
                     convertMappedIntArray2StringArray(
                         mainMap,
                         string2intarray( xRow->getString( 7 ) ) ) ) );
@@ -174,13 +174,13 @@ void Keys::refresh()
             {
                 OUString buf = xRow->getString( 6 ) + "." + xRow->getString( 5 );
                 pKey->setPropertyValue_NoBroadcast_public(
-                    st.REFERENCED_TABLE, makeAny( buf ) );
+                    st.REFERENCED_TABLE, Any( buf ) );
 
                 Int2StringMap foreignMap;
                 fillAttnum2attnameMap( foreignMap, m_origin, xRow->getString(6), xRow->getString(5));
                 pKey->setPropertyValue_NoBroadcast_public(
                     st.PRIVATE_FOREIGN_COLUMNS,
-                    makeAny(
+                    Any(
                     convertMappedIntArray2StringArray(
                         foreignMap,
                         string2intarray( xRow->getString(8) ) ) ) );
@@ -189,7 +189,7 @@ void Keys::refresh()
 
             {
                 map[ xRow->getString( 1 ) ] = keyIndex;
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 ++keyIndex;
             }
         }
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 9ac52f1df0ff..4a659ffb9941 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -60,7 +60,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::Type;
 
 using com::sun::star::beans::XPropertySet;
@@ -168,7 +167,7 @@ void Table::rename( const OUString& newName )
         if( Xrename.is() )
         {
             Xrename->rename( newName );
-            setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, makeAny(newSchemaName) );
+            setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, Any(newSchemaName) );
         }
     }
     else
@@ -185,7 +184,7 @@ void Table::rename( const OUString& newName )
                 bufferQuoteIdentifier( buf, newSchemaName, m_pSettings );
                 Reference< XStatement > statement = m_conn->createStatement();
                 statement->executeUpdate( buf.makeStringAndClear() );
-                setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, makeAny(newSchemaName) );
+                setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, Any(newSchemaName) );
                 disposeNoThrow( statement );
                 schema = newSchemaName;
             }
@@ -209,7 +208,7 @@ void Table::rename( const OUString& newName )
             disposeNoThrow( statement );
         }
     }
-    setPropertyValue_NoBroadcast_public( st.NAME, makeAny(newTableName) );
+    setPropertyValue_NoBroadcast_public( st.NAME, Any(newTableName) );
     // inform the container of the name change !
     if( m_pSettings->tables.is() )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 47606669dd40..f1a089ff031a 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -55,7 +55,6 @@ using osl::MutexGuard;
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
@@ -111,16 +110,16 @@ void Tables::refresh()
             OUString name = xRow->getString( TABLE_INDEX_NAME+1);
             OUString schema = xRow->getString( TABLE_INDEX_SCHEMA+1);
             pTable->setPropertyValue_NoBroadcast_public(
-                st.CATALOG_NAME , makeAny(xRow->getString( TABLE_INDEX_CATALOG+1) ) );
-            pTable->setPropertyValue_NoBroadcast_public( st.NAME , makeAny( name ) );
-            pTable->setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME , makeAny( schema ));
+                st.CATALOG_NAME , Any(xRow->getString( TABLE_INDEX_CATALOG+1) ) );
+            pTable->setPropertyValue_NoBroadcast_public( st.NAME , Any( name ) );
+            pTable->setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME , Any( schema ));
             pTable->setPropertyValue_NoBroadcast_public(
-                st.TYPE , makeAny( xRow->getString( TABLE_INDEX_TYPE+1) ) );
+                st.TYPE , Any( xRow->getString( TABLE_INDEX_TYPE+1) ) );
             pTable->setPropertyValue_NoBroadcast_public(
-                st.DESCRIPTION , makeAny( xRow->getString( TABLE_INDEX_REMARKS+1) ) );
+                st.DESCRIPTION , Any( xRow->getString( TABLE_INDEX_REMARKS+1) ) );
             pTable->setPropertyValue_NoBroadcast_public(
                 st.PRIVILEGES ,
-                makeAny( sal_Int32( css::sdbcx::Privilege::SELECT |
+                Any( sal_Int32( css::sdbcx::Privilege::SELECT |
                            css::sdbcx::Privilege::INSERT |
                            css::sdbcx::Privilege::UPDATE |
                            css::sdbcx::Privilege::DELETE |
@@ -131,7 +130,7 @@ void Tables::refresh()
                            css::sdbcx::Privilege::DROP ) ) );
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ schema + "." + name ] = tableIndex;
                 ++tableIndex;
             }
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index bc8b62b1d5b4..a12c86ed2375 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -51,7 +51,7 @@ using osl::MutexGuard;
 
 using com::sun::star::beans::XPropertySet;
 
-using com::sun::star::uno::makeAny;
+using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 
@@ -98,10 +98,10 @@ void Users::refresh()
 
             OUString name = xRow->getString( 1);
             pUser->setPropertyValue_NoBroadcast_public(
-                st.NAME , makeAny(xRow->getString( TABLE_INDEX_CATALOG+1) ) );
+                st.NAME , Any(xRow->getString( TABLE_INDEX_CATALOG+1) ) );
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ name ] = tableIndex;
                 ++tableIndex;
             }
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index 3652cdee634f..2b8f61be708d 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -52,7 +52,6 @@ using osl::MutexGuard;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using com::sun::star::uno::Type;
 
 using com::sun::star::beans::XPropertySet;
@@ -121,7 +120,7 @@ void View::rename( const OUString& newName )
             bufferQuoteIdentifier( buf, newSchemaName, m_pSettings );
             Reference< XStatement > statement = m_conn->createStatement();
             statement->executeUpdate( buf.makeStringAndClear() );
-            setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, makeAny(newSchemaName) );
+            setPropertyValue_NoBroadcast_public( st.SCHEMA_NAME, Any(newSchemaName) );
             disposeNoThrow( statement );
             schema = newSchemaName;
         }
@@ -142,7 +141,7 @@ void View::rename( const OUString& newName )
         bufferQuoteIdentifier( buf, newTableName, m_pSettings );
         Reference< XStatement > statement = m_conn->createStatement();
         statement->executeUpdate( buf.makeStringAndClear() );
-        setPropertyValue_NoBroadcast_public( st.NAME, makeAny(newTableName) );
+        setPropertyValue_NoBroadcast_public( st.NAME, Any(newTableName) );
     }
 
     // inform the container of the name change !
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx
index d71219fa6420..3dfdfaa5fe64 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx
@@ -52,7 +52,7 @@ using osl::MutexGuard;
 
 using com::sun::star::beans::XPropertySet;
 
-using com::sun::star::uno::makeAny;
+using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 
@@ -110,12 +110,12 @@ void Views::refresh()
             rtl::Reference<View> pView = new View (m_xMutex, m_origin, m_pSettings );
             Reference< css::beans::XPropertySet > prop = pView;
 
-            pView->setPropertyValue_NoBroadcast_public(st.NAME , makeAny(table) );
-            pView->setPropertyValue_NoBroadcast_public(st.SCHEMA_NAME, makeAny(schema) );
-            pView->setPropertyValue_NoBroadcast_public(st.COMMAND, makeAny(command) );
+            pView->setPropertyValue_NoBroadcast_public(st.NAME , Any(table) );
+            pView->setPropertyValue_NoBroadcast_public(st.SCHEMA_NAME, Any(schema) );
+            pView->setPropertyValue_NoBroadcast_public(st.COMMAND, Any(command) );
 
             {
-                m_values.push_back( makeAny( prop ) );
+                m_values.push_back( Any( prop ) );
                 map[ schema + "." + table ] = viewIndex;
                 ++viewIndex;
             }
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index c605573b703e..e7e0adf5e4fb 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -99,7 +99,7 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
     if ( !hasMoreElements() )
         throwNoSuchElementException();
 
-    return makeAny( *m_aPos++ );
+    return Any( *m_aPos++ );
 }
 
 namespace
@@ -186,7 +186,7 @@ namespace
 
             // one argument for creating the node access: the path to the configuration node
             Sequence< Any > aCreationArgs{ Any(NamedValue(
-                "nodepath", makeAny( OUString("org.openoffice.Office.DataAccess/DriverManager") ) )) };
+                "nodepath", Any( OUString("org.openoffice.Office.DataAccess/DriverManager") ) )) };
 
             // create the node access
             Reference< XNameAccess > xDriverManagerNode(
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 662a000870b7..1ce49b5ff95d 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -274,7 +274,7 @@ namespace
             sComposedName.clear();
 
             Reference< XResultSet> xRes = _rxDBMeta->getTables(
-                !_rCatalog.isEmpty() ? makeAny( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes );
+                !_rCatalog.isEmpty() ? Any( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes );
 
             Reference< XRow > xCurrentRow( xRes, UNO_QUERY );
             if ( xCurrentRow.is() && xRes->next() )
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 8ab9072f004c..804c8c361942 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -302,7 +302,7 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index )
     if (Index < 0 || Index >= m_pElements->size() )
         throw IndexOutOfBoundsException(OUString::number(Index),static_cast<XTypeProvider*>(this));
 
-    return makeAny(getObject(Index));
+    return Any(getObject(Index));
 }
 
 Any SAL_CALL OCollection::getByName( const OUString& aName )
@@ -319,7 +319,7 @@ Any SAL_CALL OCollection::getByName( const OUString& aName )
         throw NoSuchElementException( sError, static_cast< XTypeProvider* >( this ) );
     }
 
-    return makeAny(getObject(m_pElements->findColumn(aName)));
+    return Any(getObject(m_pElements->findColumn(aName)));
 }
 
 Sequence< OUString > SAL_CALL OCollection::getElementNames(  )
@@ -383,7 +383,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >&
         m_pElements->insert( sName, xNewlyCreated );
 
     // notify our container listeners
-    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(sName), makeAny(xNewlyCreated), Any());
+    ContainerEvent aEvent(static_cast<XContainer*>(this), Any(sName), Any(xNewlyCreated), Any());
     aGuard.clear();
     m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvent );
 }
@@ -423,7 +423,7 @@ void OCollection::dropImpl(sal_Int32 _nIndex, bool _bReallyDrop)
 
 void OCollection::notifyElementRemoved(const OUString& _sName)
 {
-    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_sName), Any(), Any());
+    ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_sName), Any(), Any());
     // note that xExistent may be empty, in case somebody removed the data source while it is not alive at this moment
     OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
     while (aListenerLoop.hasMoreElements())
@@ -517,7 +517,7 @@ void OCollection::renameObject(const OUString& _sOldName, const OUString& _sNewN
 
     if ( m_pElements->rename(_sOldName,_sNewName) )
     {
-        ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_sNewName), makeAny(m_pElements->getObject(_sNewName)),makeAny(_sOldName));
+        ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_sNewName), Any(m_pElements->getObject(_sNewName)),Any(_sOldName));
         // note that xExistent may be empty, in case somebody removed the data source while it is not alive at this moment
         OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
         while (aListenerLoop.hasMoreElements())