Just use Any ctor instead of makeAny in dbaccess

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

7 files changed, 18 insertions, 18 deletions

diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 0ca6502ca93e..d8a6d2621fe3 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -141,7 +141,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, weld::Button&, void)
 
                     Reference<XInteractionHandler2> xHandler(
                         InteractionHandler::createWithParent(m_xContext, m_xDialog->GetXWindow()));
-                    rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest(makeAny(aException));
+                    rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest(Any(aException));
 
                     rtl::Reference<OInteractionApprove> pApprove = new OInteractionApprove;
                     pRequest->addContinuation(pApprove);
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 551f613fe5bb..ca20930ef8df 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -210,7 +210,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
     const SfxStringItem* pUser = m_pItemSetHelper->getOutputSet()->GetItem<SfxStringItem>(DSID_USER);
     if (pUser && pUser->GetValue().getLength())
         aReturn.emplace_back(  "user", 0,
-                            makeAny(pUser->GetValue()), PropertyState_DIRECT_VALUE);
+                            Any(pUser->GetValue()), PropertyState_DIRECT_VALUE);
 
     // check if the connection type requires a password
     if (hasAuthentication(*m_pItemSetHelper->getOutputSet()))
@@ -260,7 +260,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
             aRequest.HasAccount  = false;
             // aRequest.Account
 
-            rtl::Reference<comphelper::OInteractionRequest> pRequest = new comphelper::OInteractionRequest(makeAny(aRequest));
+            rtl::Reference<comphelper::OInteractionRequest> pRequest = new comphelper::OInteractionRequest(Any(aRequest));
 
             // build an interaction request
             // two continuations (Ok and Cancel)
@@ -294,7 +294,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
 
         if (!sPassword.isEmpty())
             aReturn.emplace_back( "password", 0,
-                               makeAny(sPassword), PropertyState_DIRECT_VALUE);
+                               Any(sPassword), PropertyState_DIRECT_VALUE);
     }
 
     if ( !aReturn.empty() )
@@ -320,7 +320,7 @@ void ODbDataSourceAdministrationHelper::successfullyConnected()
             OUString sPassword = pPassword->GetValue();
 
             Reference< XPropertySet > xCurrentDatasource = getCurrentDataSource();
-            lcl_putProperty(xCurrentDatasource,m_aDirectPropTranslator[DSID_PASSWORD], makeAny(sPassword));
+            lcl_putProperty(xCurrentDatasource,m_aDirectPropTranslator[DSID_PASSWORD], Any(sPassword));
         }
     }
 }
@@ -648,7 +648,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
             {
                 if ( sUrlProp == elem.second )
                 {
-                    Any aValue(makeAny(getConnectionURL()));
+                    Any aValue(getConnectionURL());
                     //  aValue <<= OUString();
                     lcl_putProperty(_rxDest, elem.second,aValue);
                 }
@@ -671,7 +671,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
     // overwrite and extend them
     fillDatasourceInfo(_rSource, aInfo);
     // and propagate the (newly composed) sequence to the set
-    lcl_putProperty(_rxDest,PROPERTY_INFO, makeAny(aInfo));
+    lcl_putProperty(_rxDest,PROPERTY_INFO, Any(aInfo));
 }
 
 void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rSource, Sequence< css::beans::PropertyValue >& _rInfo)
@@ -700,7 +700,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
                 OUString sCharSet;
                 implTranslateProperty(pCurrent) >>= sCharSet;
                 if ( !sCharSet.isEmpty() )
-                    aRelevantSettings.insert(PropertyValue(aTranslation->second, 0, makeAny(sCharSet), PropertyState_DIRECT_VALUE));
+                    aRelevantSettings.insert(PropertyValue(aTranslation->second, 0, Any(sCharSet), PropertyState_DIRECT_VALUE));
             }
             else
                 aRelevantSettings.insert(PropertyValue(aTranslation->second, 0, implTranslateProperty(pCurrent), PropertyState_DIRECT_VALUE));
@@ -770,7 +770,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
     // here we have a special entry for types from oracle
     if ( aTypeSettings.hasElements() )
     {
-        aRelevantSettings.insert(PropertyValue("TypeInfoSettings", 0, makeAny(aTypeSettings), PropertyState_DIRECT_VALUE));
+        aRelevantSettings.insert(PropertyValue("TypeInfoSettings", 0, Any(aTypeSettings), PropertyState_DIRECT_VALUE));
     }
 
     // check which values are still left ('cause they were not present in the original sequence, but are to be set)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 672830edd85b..b601c49391fc 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -200,8 +200,8 @@ IMPL_LINK(OUserAdmin, UserHdl, weld::Button&, rButton, void)
                 Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor();
                 if(xNewUser.is())
                 {
-                    xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(aPwdDlg.GetUser()));
-                    xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(aPwdDlg.GetPassword()));
+                    xNewUser->setPropertyValue(PROPERTY_NAME,Any(aPwdDlg.GetUser()));
+                    xNewUser->setPropertyValue(PROPERTY_PASSWORD,Any(aPwdDlg.GetPassword()));
                     Reference<XAppend> xAppend(m_xUsers,UNO_QUERY);
                     if(xAppend.is())
                         xAppend->appendByDescriptor(xNewUser);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index d12688d2cbd8..89f74ab72b97 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -414,7 +414,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
     try
     {
         ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext());
-        aContent.executeCommand( "delete", makeAny( true ) );
+        aContent.executeCommand( "delete", Any( true ) );
     }
     catch (const Exception& )
     {
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 8b7273b44d70..63be5dd12875 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -281,7 +281,7 @@ void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xCont
     lcl_removeUnused(aOldProperties,aNewProperties,aDS);
 
     aDS >>= aInfo;
-    _xDatasource->setPropertyValue(PROPERTY_INFO,uno::makeAny(aInfo));
+    _xDatasource->setPropertyValue(PROPERTY_INFO,uno::Any(aInfo));
 }
 
 void ODbTypeWizDialogSetup::activateDatabasePath()
@@ -699,7 +699,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
                     aRequest.Code = IOErrorCode_GENERAL;
                 aRequest.Message = e.Message;
                 aRequest.Context = e.Context;
-                lcl_handle( xHandler, makeAny( aRequest ) );
+                lcl_handle( xHandler, Any( aRequest ) );
             }
         }
     }
@@ -738,7 +738,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
             OSL_ENSURE(xDatasource.is(),"DataSource is null!");
             if ( xDatasource.is() )
-                xDatasource->setPropertyValue( PROPERTY_INFO, makeAny( m_pCollection->getDefaultDBSettings( eType ) ) );
+                xDatasource->setPropertyValue( PROPERTY_INFO, Any( m_pCollection->getDefaultDBSettings( eType ) ) );
             m_pImpl->translateProperties(xDatasource,*m_pOutSet);
         }
         else if ( m_pCollection->isFileSystemBased(eType) )
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index bcf8923abfaa..bfc36c44eea1 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -213,7 +213,7 @@ namespace dbaui
                 Reference< com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY_THROW);
                 try
                 {
-                    xStatementProps->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, makeAny(false));
+                    xStatementProps->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(false));
                 }
                 catch( const Exception& )
                 {
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index d8ff8f863923..6094f84e79a8 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -205,9 +205,9 @@ namespace dbaui
                     bool bModified = ( xModi.is() && xModi->isModified() );
 
                     Sequence< OUString > aNewTableFilter { "%" };
-                    xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter));
+                    xProp->setPropertyValue(PROPERTY_TABLEFILTER,Any(aNewTableFilter));
 
-                    xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) );
+                    xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, Any( Sequence< OUString >() ) );
                     Reference< css::lang::XEventListener> xEvt;
                     aErrorInfo = ::dbaui::createConnection(xProp, m_xORB, xEvt, m_xCurrentConnection);