Just use Any ctor instead of makeAny in forms

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

37 files changed, 156 insertions, 162 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index c3597da7d070..3c08b6524763 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -715,7 +715,7 @@ void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled
         // enable or disable our peer, according to the new state
         Reference< XVclWindowPeer > xPeer( getPeer(), UNO_QUERY );
         if ( xPeer.is() )
-            xPeer->setProperty( PROPERTY_ENABLED, makeAny( m_bEnabledByPropertyValue && _bEnabled ) );
+            xPeer->setProperty( PROPERTY_ENABLED, Any( m_bEnabledByPropertyValue && _bEnabled ) );
             // if we're disabled according to our model's property, then
             // we don't care for the feature state, but *are* disabled.
             // If the model's property states that we're enabled, then we *do*
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 3453b15169ed..7ab2e08019b4 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -189,7 +189,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType )
 OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName )
     :OGridColumn_BASE(m_aMutex)
     ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper)
-    ,m_aHidden( makeAny( false ) )
+    ,m_aHidden( Any( false ) )
     ,m_aModelName(_sModelName)
 {
 
@@ -443,7 +443,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         case PROPERTY_ID_ALIGN:
             return Any();
         case PROPERTY_ID_HIDDEN:
-            return makeAny(false);
+            return Any(false);
         default:
             return OPropertySetAggregationHelper::getPropertyDefaultByHandle(nHandle);
     }
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 7bf52797a98a..d38c16abc489 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -444,8 +444,8 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
         &&  !hasExternalListSource()
         )
     {
-        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
-        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, makeAny( css::uno::Sequence<css::uno::Any>() ) );
+        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( css::uno::Sequence<OUString>() ) );
+        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, Any( css::uno::Sequence<css::uno::Any>() ) );
     }
 
     if (nVersion > 0x0004)
@@ -662,9 +662,9 @@ void OComboBoxModel::loadData( bool _bForce )
     }
 
     // Set String-Sequence at ListBox
-    setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( comphelper::containerToSequence(aStringList) ) );
+    setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( comphelper::containerToSequence(aStringList) ) );
     // Reset TypedItemList, no matching data.
-    setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, makeAny( css::uno::Sequence<css::uno::Any>() ) );
+    setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, Any( css::uno::Sequence<css::uno::Any>() ) );
 }
 
 
@@ -687,7 +687,7 @@ void OComboBoxModel::onDisconnectedDbColumn()
 
     // reset the string item list
     if ( !hasExternalListSource() )
-        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( m_aDesignModeStringItems ) );
+        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( m_aDesignModeStringItems ) );
 
     m_aListRowSet.dispose();
 }
@@ -776,8 +776,8 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
         aStringItemList.realloc( nOldLen + 1 );
         aStringItemList.getArray()[ nOldLen ] = sNewValue;
 
-        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( aStringItemList ) );
-        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, makeAny( css::uno::Sequence<css::uno::Any>() ) );
+        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( aStringItemList ) );
+        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, Any( css::uno::Sequence<css::uno::Any>() ) );
     }
 
     return true;
@@ -808,14 +808,14 @@ Any OComboBoxModel::translateDbColumnToControlValue()
     else
         m_aLastKnownValue.clear();
 
-    return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( OUString() );
+    return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : Any( OUString() );
         // (m_aLastKnownValue is allowed to be VOID, the control value isn't)
 }
 
 
 Any OComboBoxModel::getDefaultForReset() const
 {
-    return makeAny( m_aDefaultText );
+    return Any( m_aDefaultText );
 }
 
 
@@ -823,8 +823,8 @@ void OComboBoxModel::stringItemListChanged( ControlModelLock& /*_rInstanceLock*/
 {
     if ( m_xAggregateSet.is() )
     {
-        m_xAggregateSet->setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( comphelper::containerToSequence(getStringItemList()) ) );
-        m_xAggregateSet->setPropertyValue( PROPERTY_TYPEDITEMLIST, makeAny( getTypedItemList()) ) ;
+        m_xAggregateSet->setPropertyValue( PROPERTY_STRINGITEMLIST, Any( comphelper::containerToSequence(getStringItemList()) ) );
+        m_xAggregateSet->setPropertyValue( PROPERTY_TYPEDITEMLIST, Any( getTypedItemList()) ) ;
     }
 }
 
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index e0eb2bddd19f..2e4839dd82d4 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -96,8 +96,8 @@ void OCurrencyModel::implConstruct()
         }
         if (!sCurrencySymbol.isEmpty())
         {
-            m_xAggregateSet->setPropertyValue(PROPERTY_CURRENCYSYMBOL, makeAny(sCurrencySymbol));
-            m_xAggregateSet->setPropertyValue(PROPERTY_CURRSYM_POSITION, makeAny(bPrependCurrencySymbol));
+            m_xAggregateSet->setPropertyValue(PROPERTY_CURRENCYSYMBOL, Any(sCurrencySymbol));
+            m_xAggregateSet->setPropertyValue(PROPERTY_CURRSYM_POSITION, Any(bPrependCurrencySymbol));
         }
     }
     catch(const Exception&)
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index e22acf270fb5..cfb22d927335 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1021,7 +1021,7 @@ void ODatabaseForm::onError( const SQLException& _rException, const OUString& _r
     if ( !m_aErrorListeners.getLength() )
         return;
 
-    SQLErrorEvent aEvent( *this, makeAny( prependErrorInfo( _rException, *this, _rContextDescription ) ) );
+    SQLErrorEvent aEvent( *this, Any( prependErrorInfo( _rException, *this, _rContextDescription ) ) );
     onError( aEvent );
 }
 
@@ -1127,15 +1127,15 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie
 
         // switch to "insert only" mode
         saveInsertOnlyState( );
-        m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, makeAny( true ) );
+        m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, Any( true ) );
     }
     else if (m_bAllowInsert || m_bAllowUpdate || m_bAllowDelete)
         nConcurrency = ResultSetConcurrency::UPDATABLE;
     else
         nConcurrency = ResultSetConcurrency::READ_ONLY;
 
-    m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_CONCURRENCY, makeAny( nConcurrency ) );
-    m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_TYPE, makeAny( sal_Int32(ResultSetType::SCROLL_SENSITIVE) ) );
+    m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_CONCURRENCY, Any( nConcurrency ) );
+    m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_TYPE, Any( sal_Int32(ResultSetType::SCROLL_SENSITIVE) ) );
 
     bool bSuccess = false;
     try
@@ -1616,7 +1616,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
             if ( m_aIgnoreResult.hasValue() )
                 m_aIgnoreResult <<= m_bInsertOnly;
             else
-                m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, makeAny( m_bInsertOnly ) );
+                m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, Any( m_bInsertOnly ) );
             break;
 
         case PROPERTY_ID_FILTER:
@@ -2365,7 +2365,7 @@ void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInte
     bool bIsEmbedded = ::dbtools::isEmbeddedInDatabase( Parent, xOuterConnection );
 
     if ( bIsEmbedded )
-        xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( OUString() ) );
+        xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, Any( OUString() ) );
 }
 
 
@@ -2416,7 +2416,7 @@ void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlM
                 {
                     Reference<XPropertySet>  xSet(xComp, UNO_QUERY);
                     if (xSet.is() && hasProperty(PROPERTY_TABINDEX, xSet))
-                        xSet->setPropertyValue( PROPERTY_TABINDEX, makeAny(nTabIndex++) );
+                        xSet->setPropertyValue( PROPERTY_TABINDEX, Any(nTabIndex++) );
                     break;
                 }
             }
@@ -2455,7 +2455,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
         if (sGroupName.isEmpty())
             xSet->getPropertyValue(PROPERTY_NAME) >>= sGroupName;
         else
-            xSet->setPropertyValue(PROPERTY_NAME, makeAny(sGroupName));
+            xSet->setPropertyValue(PROPERTY_NAME, Any(sGroupName));
     }
 }
 
@@ -2678,7 +2678,7 @@ void ODatabaseForm::doShareConnection( const Reference< XPropertySet >& _rxParen
 
         // forward the connection to our own aggregate
         m_bForwardingConnection = true;
-        m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( xParentConn ) );
+        m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, Any( xParentConn ) );
         m_bForwardingConnection = false;
 
         m_bSharingConnection = true;
@@ -2720,7 +2720,7 @@ void ODatabaseForm::stopSharingConnection( )
     // reset the property
     xSharedConn.clear();
     m_bForwardingConnection = true;
-    m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( xSharedConn ) );
+    m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, Any( xSharedConn ) );
     m_bForwardingConnection = false;
 
     // reset the flag
@@ -2755,7 +2755,7 @@ bool ODatabaseForm::implEnsureConnection()
         Reference< XConnection > xOuterConnection;
         if ( ::dbtools::isEmbeddedInDatabase( getParent(), xOuterConnection ) )
         {
-            m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( xOuterConnection ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, Any( xOuterConnection ) );
             return xOuterConnection.is();
         }
 
@@ -2829,7 +2829,7 @@ void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const
     // a database form always uses caching
     // we use starting fetchsize with at least 10 rows
     if (bConnected)
-        m_xAggregateSet->setPropertyValue(PROPERTY_FETCHSIZE, makeAny(sal_Int32(40)));
+        m_xAggregateSet->setPropertyValue(PROPERTY_FETCHSIZE, Any(sal_Int32(40)));
 
     // if we're loaded as sub form we got a "rowSetChanged" from the parent rowset _before_ we got the "loaded"
     // so we don't need to execute the statement again, this was already done
@@ -3881,10 +3881,10 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
     OUString sAggregateProp;
     _rxInStream >> sAggregateProp;
     if (m_xAggregateSet.is())
-        m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, makeAny(sAggregateProp));
+        m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, Any(sAggregateProp));
     _rxInStream >> sAggregateProp;
     if (m_xAggregateSet.is())
-        m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND, makeAny(sAggregateProp));
+        m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND, Any(sAggregateProp));
 
     _rxInStream >> m_aMasterFields;
     _rxInStream >> m_aDetailFields;
@@ -3900,13 +3900,13 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
         {
             nCommandType = CommandType::COMMAND;
             bool bEscapeProcessing = static_cast<DataSelectionType>(nCursorSourceType) != DataSelectionType_SQLPASSTHROUGH;
-            m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, makeAny(bEscapeProcessing));
+            m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(bEscapeProcessing));
         }
         break;
         default : OSL_FAIL("ODatabaseForm::read : wrong CommandType !");
     }
     if (m_xAggregateSet.is())
-        m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(nCommandType));
+        m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, Any(nCommandType));
 
     // obsolete
     _rxInStream->readShort();
@@ -3919,7 +3919,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
 
     bool bInsertOnly = _rxInStream->readBoolean();
     if (m_xAggregateSet.is())
-        m_xAggregateSet->setPropertyValue(PROPERTY_INSERTONLY, makeAny(bInsertOnly));
+        m_xAggregateSet->setPropertyValue(PROPERTY_INSERTONLY, Any(bInsertOnly));
 
     m_bAllowInsert      = _rxInStream->readBoolean();
     m_bAllowUpdate      = _rxInStream->readBoolean();
@@ -3941,12 +3941,12 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
 
         _rxInStream >> sAggregateProp;
         if (m_xAggregateSet.is())
-            m_xAggregateSet->setPropertyValue(PROPERTY_FILTER, makeAny(sAggregateProp));
+            m_xAggregateSet->setPropertyValue(PROPERTY_FILTER, Any(sAggregateProp));
         if(nVersion > 3)
         {
             _rxInStream >> sAggregateProp;
             if (m_xAggregateSet.is())
-                m_xAggregateSet->setPropertyValue(PROPERTY_SORT, makeAny(sAggregateProp));
+                m_xAggregateSet->setPropertyValue(PROPERTY_SORT, Any(sAggregateProp));
         }
     }
 
@@ -3963,13 +3963,13 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
             m_aCycle.clear();
     }
     if (m_xAggregateSet.is())
-        m_xAggregateSet->setPropertyValue(PROPERTY_APPLYFILTER, makeAny((nAnyMask & DONTAPPLYFILTER) == 0));
+        m_xAggregateSet->setPropertyValue(PROPERTY_APPLYFILTER, Any((nAnyMask & DONTAPPLYFILTER) == 0));
 
     if(nVersion > 4)
     {
         _rxInStream >> sAggregateProp;
         if (m_xAggregateSet.is())
-            m_xAggregateSet->setPropertyValue(PROPERTY_HAVINGCLAUSE, makeAny(sAggregateProp));
+            m_xAggregateSet->setPropertyValue(PROPERTY_HAVINGCLAUSE, Any(sAggregateProp));
     }
 }
 
@@ -4029,7 +4029,7 @@ OUString SAL_CALL ODatabaseForm::getName()
 
 void SAL_CALL ODatabaseForm::setName(const OUString& aName)
 {
-    setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName));
+    setFastPropertyValue(PROPERTY_ID_NAME, Any(aName));
 }
 
 }   // namespace frm
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 764b9f732ecc..9b1b3c496a0d 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -86,7 +86,7 @@ ODateModel::ODateModel(const Reference<XComponentContext>& _rxFactory)
     try
     {
         if ( m_xAggregateSet.is() )
-            m_xAggregateSet->setPropertyValue( PROPERTY_DATEMIN, makeAny(util::Date(1, 1, 1800)) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_DATEMIN, Any(util::Date(1, 1, 1800)) );
     }
     catch( const Exception& )
     {
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 00b22a797b92..6c7d83f20bf5 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -514,19 +514,19 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
         aCurrentText = m_xAggregateSet->getPropertyValue(PROPERTY_TEXT);
 
         m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN) >>= nOldTextLen;
-        m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(sal_Int16(0)));
+        m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, Any(sal_Int16(0)));
     }
 
     OEditBaseModel::write(_rxOutStream);
 
     if ( m_bMaxTextLenModified )
     {   // Reset again
-        m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(nOldTextLen));
+        m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, Any(nOldTextLen));
         // and reset the text
         // First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks
         // we aren't changing the prop (it didn't notify the - implicit - change of the text prop while setting the max text len)
         // This seems to be a bug with in toolkit's EditControl-implementation.
-        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(OUString()));
+        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, Any(OUString()));
         m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, aCurrentText);
     }
 }
@@ -546,7 +546,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream)
             &&  (getString(aDefaultControl) == STARDIV_ONE_FORM_CONTROL_TEXTFIELD )
             )
         {
-            m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( OUString(STARDIV_ONE_FORM_CONTROL_EDIT) ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, Any( OUString(STARDIV_ONE_FORM_CONTROL_EDIT) ) );
             // Older as well as current versions should understand this : the former knew only the STARDIV_ONE_FORM_CONTROL_EDIT,
             // the latter are registered for both STARDIV_ONE_FORM_CONTROL_EDIT and STARDIV_ONE_FORM_CONTROL_TEXTFIELD.
         }
@@ -689,13 +689,13 @@ Any OEditModel::translateDbColumnToControlValue()
         }
     }
 
-    return aRet.hasValue() ? aRet : makeAny( OUString() );
+    return aRet.hasValue() ? aRet : Any( OUString() );
 }
 
 
 Any OEditModel::getDefaultForReset() const
 {
-    return makeAny( m_aDefaultText );
+    return Any( m_aDefaultText );
 }
 
 }
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 80e8d245c95d..b584eaa8284d 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -358,9 +358,9 @@ Any OEditBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     switch (nHandle)
     {
         case PROPERTY_ID_DEFAULT_TEXT:
-            return makeAny(OUString());
+            return Any(OUString());
         case PROPERTY_ID_FILTERPROPOSAL:
-            return makeAny(false);
+            return Any(false);
         case PROPERTY_ID_DEFAULT_VALUE:
         case PROPERTY_ID_DEFAULT_DATE:
         case PROPERTY_ID_DEFAULT_TIME:
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 3f20bc90cc82..f363d39d7cb6 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -131,7 +131,7 @@ Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     switch ( _nHandle )
     {
         case PROPERTY_ID_DEFAULT_TEXT:
-            return makeAny( OUString() );
+            return Any( OUString() );
     }
     return OControlModel::getPropertyDefaultByHandle( _nHandle );
 }
@@ -245,7 +245,7 @@ void SAL_CALL OFileControlModel::reset()
         // don't lock our mutex as setting aggregate properties
         // may cause any uno controls belonging to us to lock the solar mutex, which is potentially dangerous with
         // our own mutex locked
-        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(m_sDefaultValue));
+        m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, Any(m_sDefaultValue));
         m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt );
     }
 }
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 46666713f6b4..a2a2ec5ca77c 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -183,8 +183,8 @@ namespace frm
                 case FormComponentType::CHECKBOX:
                 {
                     // checkboxes always have a tristate-mode
-                    xVclWindow->setProperty( PROPERTY_TRISTATE, makeAny( true ) );
-                    xVclWindow->setProperty( PROPERTY_STATE, makeAny( sal_Int32( TRISTATE_INDET ) ) );
+                    xVclWindow->setProperty( PROPERTY_TRISTATE, Any( true ) );
+                    xVclWindow->setProperty( PROPERTY_STATE, Any( sal_Int32( TRISTATE_INDET ) ) );
 
                     Reference< XCheckBox >  xBox( getPeer(), UNO_QUERY_THROW );
                     xBox->addItemListener( this );
@@ -194,7 +194,7 @@ namespace frm
 
                 case FormComponentType::RADIOBUTTON:
                 {
-                    xVclWindow->setProperty( PROPERTY_STATE, makeAny( sal_Int32( TRISTATE_FALSE ) ) );
+                    xVclWindow->setProperty( PROPERTY_STATE, Any( sal_Int32( TRISTATE_FALSE ) ) );
 
                     Reference< XRadioButton >  xRadio( getPeer(), UNO_QUERY_THROW );
                     xRadio->addItemListener( this );
@@ -210,7 +210,7 @@ namespace frm
 
                 case FormComponentType::COMBOBOX:
                 {
-                    xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, makeAny( true ) );
+                    xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, Any( true ) );
                     [[fallthrough]];
                 }
 
@@ -230,7 +230,7 @@ namespace frm
             Reference< XPropertySet > xModel( getModel(), UNO_QUERY_THROW );
             Reference< XPropertySetInfo > xModelPSI( xModel->getPropertySetInfo(), UNO_SET_THROW );
             if ( xModelPSI->hasPropertyByName( PROPERTY_READONLY ) )
-                xVclWindow->setProperty( PROPERTY_READONLY, makeAny( false ) );
+                xVclWindow->setProperty( PROPERTY_READONLY, Any( false ) );
         }
         catch( const Exception& )
         {
@@ -730,7 +730,7 @@ namespace frm
     {
         try
         {
-            Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create( m_xContext, "",  m_xMessageParent, makeAny(_rExcept));
+            Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create( m_xContext, "",  m_xMessageParent, Any(_rExcept));
             xErrorDialog->execute();
         }
         catch( const Exception& )
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 673c62d851d0..78213bd3ac4f 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -103,7 +103,7 @@ public:
     {
         Reference< XPropertySet > xNewField( m_rModel.getField() );
         if ( m_xOldField != xNewField )
-            m_rLock.addPropertyNotification( PROPERTY_ID_BOUNDFIELD, makeAny( m_xOldField ), makeAny( xNewField ) );
+            m_rLock.addPropertyNotification( PROPERTY_ID_BOUNDFIELD, Any( m_xOldField ), Any( xNewField ) );
     }
 
 private:
@@ -459,7 +459,7 @@ void OControlModel::readHelpTextCompatibly(const css::uno::Reference< css::io::X
     try
     {
         if (m_xAggregateSet.is())
-            m_xAggregateSet->setPropertyValue(PROPERTY_HELPTEXT, makeAny(sHelpText));
+            m_xAggregateSet->setPropertyValue(PROPERTY_HELPTEXT, Any(sHelpText));
     }
     catch(const Exception&)
     {
@@ -516,7 +516,7 @@ OControlModel::OControlModel(
             try
             {
                 if ( !rDefault.isEmpty() )
-                    m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( rDefault ) );
+                    m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, Any( rDefault ) );
             }
             catch( const Exception& )
             {
@@ -645,7 +645,7 @@ void SAL_CALL OControlModel::setName(const OUString& _rName)
 {
     try
     {
-        setFastPropertyValue(PROPERTY_ID_NAME, makeAny(_rName));
+        setFastPropertyValue(PROPERTY_ID_NAME, Any(_rName));
     }
     catch (const css::beans::UnknownPropertyException&)
     {
@@ -1477,7 +1477,7 @@ void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEven
         Reference<XPropertySet> xOldValue = m_xLabelControl;
         m_xLabelControl = nullptr;
         // fire a propertyChanged (when we leave aLock's scope)
-        aLock.addPropertyNotification( PROPERTY_ID_CONTROLLABEL, makeAny( xOldValue ), makeAny( m_xLabelControl ) );
+        aLock.addPropertyNotification( PROPERTY_ID_CONTROLLABEL, Any( xOldValue ), Any( m_xLabelControl ) );
     }
 
     else if ( _rEvent.Source == m_xExternalBinding )
@@ -2151,7 +2151,7 @@ void OBoundControlModel::onConnectedValidator( )
         if ( m_xAggregateSet.is() )
             xAggregatePropertyInfo = m_xAggregateSet->getPropertySetInfo();
         if ( xAggregatePropertyInfo.is() && xAggregatePropertyInfo->hasPropertyByName( PROPERTY_ENFORCE_FORMAT ) )
-            m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, makeAny( false ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, Any( false ) );
     }
 
     catch( const Exception& )
@@ -2170,7 +2170,7 @@ void OBoundControlModel::onDisconnectedValidator( )
         if ( m_xAggregateSet.is() )
             xAggregatePropertyInfo = m_xAggregateSet->getPropertySetInfo();
         if ( xAggregatePropertyInfo.is() && xAggregatePropertyInfo->hasPropertyByName( PROPERTY_ENFORCE_FORMAT ) )
-            m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, makeAny( true ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, Any( true ) );
     }
 
     catch( const Exception& )
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 80e425ad6840..dbabcaf9bcdd 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -379,7 +379,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
         Reference<XNumberFormatsSupplier>  xSupplier = calcDefaultFormatsSupplier();
         DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::setPropertyToDefaultByHandle(FORMATSSUPPLIER) : have no aggregate !");
         if (m_xAggregateSet.is())
-            m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(xSupplier));
+            m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, Any(xSupplier));
     }
     else
         OEditBaseModel::setPropertyToDefaultByHandle(nHandle);
@@ -400,7 +400,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
     {
         Reference<XNumberFormatsSupplier>  xSupplier = calcDefaultFormatsSupplier();
-        return makeAny(xSupplier);
+        return Any(xSupplier);
     }
     else
         return OEditBaseModel::getPropertyDefaultByHandle(nHandle);
@@ -571,7 +571,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                     }
                 }
                 aSupplier >>= m_xOriginalFormatter;
-                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(xSupplier));
+                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, Any(xSupplier));
                 m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, aFmtKey);
                 // Adapt the NumericFalg to my bound field
                 if (xField.is())
@@ -599,7 +599,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                 }
                 else
                     m_bNumeric = m_bOriginalNumeric;
-                setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny(m_bNumeric));
+                setPropertyValue(PROPERTY_TREATASNUMERIC, Any(m_bNumeric));
                 OSL_VERIFY( aFmtKey >>= nFormatKey );
             }
         }
@@ -616,9 +616,9 @@ void OFormattedModel::onDisconnectedDbColumn()
     OEditBaseModel::onDisconnectedDbColumn();
     if (m_xOriginalFormatter.is())
     {   // Our aggregated model does not hold any Format information
-        m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(m_xOriginalFormatter));
+        m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, Any(m_xOriginalFormatter));
         m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, Any());
-        setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny(m_bOriginalNumeric));
+        setPropertyValue(PROPERTY_TREATASNUMERIC, Any(m_bOriginalNumeric));
         m_xOriginalFormatter = nullptr;
     }
     m_nKeyType   = NumberFormat::UNDEFINED;
@@ -790,8 +790,8 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream)
     }
     if ((nKey != -1) && m_xAggregateSet.is())
     {
-                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(xSupplier));
-                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, makeAny(nKey));
+                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, Any(xSupplier));
+                m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, Any(nKey));
     }
     else
     {
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index d3a0f3f68e5d..308ed8228da9 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -293,7 +293,7 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement)
 }
 Any SAL_CALL OGridControlModel::getSelection()
 {
-    return makeAny(m_xSelection);
+    return Any(m_xSelection);
 }
 
 void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener)
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 9f56265bee00..3e8dee00e3e4 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -428,7 +428,7 @@ bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, Val
         if ( m_xColumnUpdate.is() )
             m_xColumnUpdate->updateBinaryStream( xImageStream, xImageStream->available() );
         else
-            setControlValue( makeAny( xImageStream ), _eInstigator );
+            setControlValue( Any( xImageStream ), _eInstigator );
         xImageStream->closeInput();
         return true;
     }
@@ -549,14 +549,14 @@ Any OImageControlModel::translateDbColumnToControlValue()
         Reference< XInputStream > xImageStream( m_xColumn->getBinaryStream() );
         if ( m_xColumn->wasNull() )
             xImageStream.clear();
-        return makeAny( xImageStream );
+        return Any( xImageStream );
     }
     case ImageStoreLink:
     {
         OUString sImageLink( m_xColumn->getString() );
         if ( !m_sDocumentURL.isEmpty() )
             sImageLink = INetURLObject::GetAbsURL( m_sDocumentURL, sImageLink );
-        return makeAny( sImageLink );
+        return Any( sImageLink );
     }
     case ImageStoreInvalid:
         OSL_FAIL( "OImageControlModel::translateDbColumnToControlValue: invalid field type!" );
@@ -568,7 +568,7 @@ Any OImageControlModel::translateDbColumnToControlValue()
 
 Any OImageControlModel::getControlValue( ) const
 {
-    return makeAny( m_sImageURL );
+    return Any( m_sImageURL );
 }
 
 
@@ -657,7 +657,7 @@ IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic, void )
     m_bExternalGraphic = false;
     try
     {
-        setPropertyValue( PROPERTY_GRAPHIC, makeAny( xGraphic ) );
+        setPropertyValue( PROPERTY_GRAPHIC, Any( xGraphic ) );
     }
     catch ( const Exception& )
     {
@@ -761,12 +761,12 @@ void OImageControlControl::implClearGraphics( bool _bForce )
         if ( sOldImageURL.isEmpty() )
             // the ImageURL is already empty, so simply setting a new empty one would not suffice
             // (since it would be ignored)
-            xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString( "private:emptyImage" ) ) );
+            xSet->setPropertyValue( PROPERTY_IMAGE_URL, Any( OUString( "private:emptyImage" ) ) );
                 // (the concrete URL we're passing here doesn't matter. It's important that
                 // the model cannot resolve it to a valid resource describing an image stream
     }
 
-    xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString() ) );
+    xSet->setPropertyValue( PROPERTY_IMAGE_URL, Any( OUString() ) );
 }
 
 
@@ -805,7 +805,7 @@ bool OImageControlControl::implInsertGraphics()
             OSL_VERIFY( xBoundField->getPropertyValue( PROPERTY_FIELDTYPE ) >>= nFieldType );
             bImageIsLinked = ( lcl_getImageStoreType( nFieldType ) == ImageStoreLink );
         }
-        xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, makeAny( bImageIsLinked ) );
+        xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, Any( bImageIsLinked ) );
 
         if ( ERRCODE_NONE == aDialog.Execute() )
         {
@@ -823,10 +823,10 @@ bool OImageControlControl::implInsertGraphics()
             {
                 Graphic aGraphic;
                 aDialog.GetGraphic( aGraphic );
-                xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) );
+                xSet->setPropertyValue( PROPERTY_GRAPHIC, Any( aGraphic.GetXGraphic() ) );
             }
             else
-                xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( aDialog.GetPath() ) );
+                xSet->setPropertyValue( PROPERTY_IMAGE_URL, Any( aDialog.GetPath() ) );
 
             return true;
         }
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index a4d579e92d42..d9542504a72b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -690,8 +690,8 @@ namespace frm
             &&  !hasExternalListSource()
             )
         {
-            setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
-            setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, makeAny( css::uno::Sequence<css::uno::Any>() ) );
+            setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( css::uno::Sequence<OUString>() ) );
+            setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, Any( css::uno::Sequence<css::uno::Any>() ) );
         }
 
         if (nVersion > 3)
@@ -1011,8 +1011,8 @@ namespace frm
 
         setBoundValues(std::move(aValueList));
 
-        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( lcl_convertToStringSequence( aDisplayList ) ) );
-        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, makeAny( css::uno::Sequence<css::uno::Any>() ) );
+        setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( lcl_convertToStringSequence( aDisplayList ) ) );
+        setFastPropertyValue( PROPERTY_ID_TYPEDITEMLIST, Any( css::uno::Sequence<css::uno::Any>() ) );
     }
 
 
@@ -1039,7 +1039,7 @@ namespace frm
         if ( m_eListSourceType != ListSourceType_VALUELIST )
         {
             if ( !hasExternalListSource() )
-                setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
+                setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, Any( css::uno::Sequence<OUString>() ) );
 
             m_aListRowSet.dispose();
         }
@@ -1262,7 +1262,7 @@ namespace frm
 
         m_aSaveValue = aCurrentValue;
 
-        return makeAny( translateDbValueToControlValue(aCurrentValue) );
+        return Any( translateDbValueToControlValue(aCurrentValue) );
 #else
         return Any();
 #endif
@@ -1446,7 +1446,7 @@ namespace frm
         break;
         }
 
-        return makeAny( aSelectIndexes );
+        return Any( aSelectIndexes );
     }
 
 
@@ -1520,7 +1520,7 @@ namespace frm
                 aSelectedEntriesTexts.getArray(),
                 ExtractStringFromSequence_Safe( _rStringList )
             );
-            return makeAny( aSelectedEntriesTexts );
+            return Any( aSelectedEntriesTexts );
         }
 
 
@@ -1731,8 +1731,8 @@ namespace frm
         suspendValueListening();
         try
         {
-            m_xAggregateSet->setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( comphelper::containerToSequence(getStringItemList()) ) );
-            m_xAggregateSet->setPropertyValue( PROPERTY_TYPEDITEMLIST, makeAny( getTypedItemList() ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_STRINGITEMLIST, Any( comphelper::containerToSequence(getStringItemList()) ) );
+            m_xAggregateSet->setPropertyValue( PROPERTY_TYPEDITEMLIST, Any( getTypedItemList() ) );
         }
         catch( const Exception& )
         {
@@ -1752,7 +1752,7 @@ namespace frm
             else
             {
                 if ( m_aDefaultSelectSeq.hasElements() )
-                    setControlValue( makeAny( m_aDefaultSelectSeq ), eOther );
+                    setControlValue( Any( m_aDefaultSelectSeq ), eOther );
             }
         }
     }
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 6f315aa7b60d..351db1b52aae 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -30,7 +30,6 @@ using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::sdbc::XRowSet;
 using ::com::sun::star::uno::UNO_QUERY;
 
@@ -202,7 +201,7 @@ Any OPatternModel::translateDbColumnToControlValue()
     else
         m_aLastKnownValue.clear();
 
-    return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( OUString() );
+    return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : Any( OUString() );
         // (m_aLastKnownValue is allowed to be VOID, the control value isn't)
 }
 
@@ -210,7 +209,7 @@ Any OPatternModel::translateDbColumnToControlValue()
 
 Any OPatternModel::getDefaultForReset() const
 {
-    return makeAny( m_aDefaultText );
+    return Any( m_aDefaultText );
 }
 
 void OPatternModel::resetNoBroadcast()
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 8e686e10fda6..a700f645b242 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -346,7 +346,7 @@ void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent)
 
 Any ORadioButtonModel::translateDbColumnToControlValue()
 {
-    return makeAny( static_cast<sal_Int16>( ( m_xColumn->getString() == getReferenceValue() ) ? TRISTATE_TRUE : TRISTATE_FALSE )
+    return Any( static_cast<sal_Int16>( ( m_xColumn->getString() == getReferenceValue() ) ? TRISTATE_TRUE : TRISTATE_FALSE )
     );
 }
 
@@ -373,7 +373,7 @@ bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
             sal_Int16 nValue = 0;
             m_xAggregateSet->getPropertyValue( PROPERTY_STATE ) >>= nValue;
             if ( nValue == 1 )
-                xField->setPropertyValue( PROPERTY_VALUE, makeAny( getReferenceValue() ) );
+                xField->setPropertyValue( PROPERTY_VALUE, Any( getReferenceValue() ) );
         }
         catch(const Exception&)
         {
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index 77368f76cff2..33ca9c6409f3 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -39,7 +39,7 @@ namespace frm
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::beans::XPropertySet;
-    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Any;
     using ::com::sun::star::sdbc::SQLException;
     using ::com::sun::star::sdb::XQueriesSupplier;
     using ::com::sun::star::container::XNameAccess;
@@ -132,8 +132,8 @@ namespace frm
 
             Reference< XStatement > xStatement( m_pData->xConnection->createStatement(), UNO_SET_THROW );
             Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW );
-            xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( m_pData->bEscapeProcessing ) );
-            xStatementProps->setPropertyValue( PROPERTY_RESULTSET_TYPE, makeAny( ResultSetType::FORWARD_ONLY ) );
+            xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, Any( m_pData->bEscapeProcessing ) );
+            xStatementProps->setPropertyValue( PROPERTY_RESULTSET_TYPE, Any( ResultSetType::FORWARD_ONLY ) );
 
             xResult.set( xStatement->executeQuery( m_pData->sCommand ), UNO_SET_THROW );
             m_pData->bStatementDirty = false;
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 6a1ec1120192..7079344dbc45 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -797,10 +797,10 @@ namespace frm
     {
         switch (nHandle)
         {
-            case PROPERTY_ID_BUTTONTYPE             : return makeAny( FormButtonType_PUSH );
+            case PROPERTY_ID_BUTTONTYPE             : return Any( FormButtonType_PUSH );
             case PROPERTY_ID_TARGET_URL             :
-            case PROPERTY_ID_TARGET_FRAME           : return makeAny( OUString() );
-            case PROPERTY_ID_DISPATCHURLINTERNAL    : return makeAny( false );
+            case PROPERTY_ID_TARGET_FRAME           : return Any( OUString() );
+            case PROPERTY_ID_DISPATCHURLINTERNAL    : return Any( false );
             default:
                 return OControlModel::getPropertyDefaultByHandle(nHandle);
         }
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 96be7f44c642..bbb15303b4f1 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -276,7 +276,7 @@ namespace frm
 
         case PROPERTY_ID_FONT:
         {
-            Any aWorkAroundGccLimitation = makeAny( m_aFont );
+            Any aWorkAroundGccLimitation( m_aFont );
             bModified = tryPropertyValue( _rConvertedValue, _rOldValue, _rValue, aWorkAroundGccLimitation, cppu::UnoType<decltype(m_aFont)>::get() );
         }
         break;
@@ -450,7 +450,7 @@ namespace frm
 
             // then set that as the actual property - will eventually call
             // this method recursively again...
-            (rBase.*pSet)(PROPERTY_ID_FONT, makeAny(font));
+            (rBase.*pSet)(PROPERTY_ID_FONT, Any(font));
 #ifndef NDEBUG
             // verify that the nHandle property has the new value
             Any tmp;
@@ -520,7 +520,7 @@ namespace frm
         {
             EmptyFontDescriptor aEmpty;
             if ( PROPERTY_ID_FONT == _nHandle )
-                return makeAny( FontDescriptor(aEmpty) );
+                return Any( FontDescriptor(aEmpty) );
             return lcl_extractFontDescriptorAggregate( _nHandle, aEmpty );
         }
 
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 85a6dd2ee765..14ff8eaef05d 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -151,7 +151,7 @@ namespace frm
 
     Any OReferenceValueComponent::getDefaultForReset() const
     {
-        return makeAny( static_cast<sal_Int16>(m_eDefaultChecked) );
+        return Any( static_cast<sal_Int16>(m_eDefaultChecked) );
     }
 
 
@@ -212,7 +212,7 @@ namespace frm
             OSL_FAIL( "OReferenceValueComponent::translateExternalValueToControlValue: unexpected value type!" );
         }
 
-        return makeAny( nState );
+        return Any( nState );
     }
 
 
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 897a1b9c806e..f39bb32a62a7 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -72,7 +72,7 @@ namespace frm
                 _rxProperties->getPropertyValue( _rMinValueName ) >>= nControlValue;
         }
 
-        return makeAny( nControlValue );
+        return Any( nControlValue );
     }
 
 
@@ -236,7 +236,7 @@ namespace frm
 
     Any OScrollBarModel::getDefaultForReset() const
     {
-        return makeAny( m_nDefaultScrollValue );
+        return Any( m_nDefaultScrollValue );
     }
 
 
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 3ae981350356..a20b17573ed2 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -190,7 +190,7 @@ namespace frm
 
     Any OSpinButtonModel::getDefaultForReset() const
     {
-        return makeAny( m_nDefaultSpinValue );
+        return Any( m_nDefaultSpinValue );
     }
 
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 1fda65382b62..f0615970aa44 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -203,7 +203,7 @@ void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource)
         {
             Reference< XCloneable > xCloneable( xSourceHierarchy->getByIndex( i ), UNO_QUERY_THROW );
             Reference< XInterface > xClone( xCloneable->createClone() );
-            insertByIndex( i, makeAny( xClone ) );
+            insertByIndex( i, Any( xClone ) );
         }
     }
     catch (const RuntimeException&)
@@ -437,7 +437,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
         {
             Reference< XInterface > xAsIFace( item, UNO_QUERY );    // important to normalize this...
             Reference< XPropertySet > xAsSet( xAsIFace, UNO_QUERY );
-            m_xEventAttacher->attach( i++, xAsIFace, makeAny( xAsSet ) );
+            m_xEventAttacher->attach( i++, xAsIFace, Any( xAsSet ) );
         }
     }
 }
@@ -488,8 +488,8 @@ namespace
             {
                 try
                 {
-                    xObjProps->setPropertyValue( PROPERTY_NAME, makeAny( ResourceManager::loadString(RID_STR_CONTROL_SUBSTITUTED_NAME) ) );
-                    xObjProps->setPropertyValue( PROPERTY_TAG, makeAny( ResourceManager::loadString(RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN) ) );
+                    xObjProps->setPropertyValue( PROPERTY_NAME, Any( ResourceManager::loadString(RID_STR_CONTROL_SUBSTITUTED_NAME) ) );
+                    xObjProps->setPropertyValue( PROPERTY_TAG, Any( ResourceManager::loadString(RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN) ) );
                 }
                 catch(const Exception&)
                 {
@@ -812,7 +812,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     if ( bHandleEvents )
     {
         m_xEventAttacher->insertEntry(_nIndex);
-        m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, makeAny( _rxElement ) );
+        m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, Any( _rxElement ) );
     }
 
     // notify derived classes
@@ -976,7 +976,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
     {
         m_xEventAttacher->insertEntry( _nIndex );
         m_xEventAttacher->attach(_nIndex, aElementMetaData->xInterface,
-                                 makeAny(aElementMetaData->xPropertySet));
+                                 Any(aElementMetaData->xPropertySet));
     }
 
     ContainerEvent aReplaceEvent;
@@ -1079,7 +1079,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An
         _rElement >>= xElementProps;
         approveNewElement( xElementProps, aElementMetaData.get() );
 
-        xElementProps->setPropertyValue( PROPERTY_NAME, makeAny( _rName ) );
+        xElementProps->setPropertyValue( PROPERTY_NAME, Any( _rName ) );
     }
     catch( const IllegalArgumentException& )
     {
@@ -1115,7 +1115,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any
         if (!hasProperty(PROPERTY_NAME, xSet))
             lcl_throwIllegalArgumentException();
 
-        xSet->setPropertyValue(PROPERTY_NAME, makeAny(Name));
+        xSet->setPropertyValue(PROPERTY_NAME, Any(Name));
     }
 
     // determine the element pos
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index ae40c527b4d6..390319dad9df 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -105,7 +105,6 @@ namespace frm
     using namespace ::com::sun::star::sdb;
     using ::com::sun::star::form::XReset;
     using ::com::sun::star::beans::XMultiPropertySet;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::lang::WrappedTargetException;
     using ::com::sun::star::ui::dialogs::XExecutableDialog;
     using ::com::sun::star::beans::NamedValue;
@@ -740,7 +739,7 @@ namespace frm
                     // simply toggle the value
                     bool bApplied = false;
                     m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied;
-                    m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( !bApplied ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( !bApplied ) );
 
                     // and reload
                     weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
@@ -1551,7 +1550,7 @@ namespace frm
             weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
             try
             {
-                m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) );
+                m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) );
                 m_xLoadableForm->reload();
             }
             catch( const Exception& )
@@ -1565,7 +1564,7 @@ namespace frm
                 try
                 {
                     m_xParser->setOrder( sOriginalSort );
-                    m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) );
                     m_xLoadableForm->reload();
                 }
                 catch( const Exception& )
@@ -1622,9 +1621,9 @@ namespace frm
             weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent()));
             try
             {
-                m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       makeAny( m_xParser->getFilter() ) );
-                m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) );
-                m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( true ) );
+                m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       Any( m_xParser->getFilter() ) );
+                m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) );
+                m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( true ) );
 
                 m_xLoadableForm->reload();
             }
@@ -1640,9 +1639,9 @@ namespace frm
                 {
                     m_xParser->setFilter      ( sOriginalFilter );
                     m_xParser->setHavingClause( sOriginalHaving );
-                    m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( bApplied ) );
-                    m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       makeAny( m_xParser->getFilter() ) );
-                    m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( bApplied ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       Any( m_xParser->getFilter() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) );
                     m_xLoadableForm->reload();
                 }
                 catch( const Exception& )
@@ -1709,11 +1708,11 @@ namespace frm
                 weld::WaitObject aWO(Application::GetFrameWeld(xDialogParent));
                 if ( _bFilter )
                 {
-                    m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       makeAny( m_xParser->getFilter() ) );
-                    m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_FILTER,       Any( m_xParser->getFilter() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) );
                 }
                 else
-                    m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) );
+                    m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) );
                 m_xLoadableForm->reload();
             }
 
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index fdee49b3277c..11ba237dea0a 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -44,7 +44,7 @@ namespace frm
 {
 
 
-    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Any;
     namespace FormFeature = ::com::sun::star::form::runtime::FormFeature;
 
 
@@ -634,7 +634,7 @@ namespace frm
     {
         if (!m_pDispatcher)
             return;
-        m_pDispatcher->dispatchWithArgument( FormFeature::MoveAbsolute, "Position", makeAny( static_cast<sal_Int32>(nRecord) ) );
+        m_pDispatcher->dispatchWithArgument( FormFeature::MoveAbsolute, "Position", Any( static_cast<sal_Int32>(nRecord) ) );
     }
 
 }   // namespace frm
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index fc3064e9e2d5..7c1b50993dc4 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -100,7 +100,7 @@ public:
         typename map_t::const_iterator aIter = findItem( rName );
         if( aIter == maItems.end() )
             throw css::container::NoSuchElementException();
-        return css::uno::makeAny( aIter->second );
+        return css::uno::Any( aIter->second );
     }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 5d986bbd26cb..e2f6a8ea02c0 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -79,7 +79,6 @@ using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::UNO_QUERY_THROW;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Exception;
-using com::sun::star::uno::makeAny;
 using com::sun::star::util::XModifyListener;
 using com::sun::star::xforms::XDataTypeRepository;
 using com::sun::star::xml::dom::NodeType_ATTRIBUTE_NODE;
@@ -1273,7 +1272,7 @@ void SAL_CALL Binding::setName( const OUString& rName )
 {
     // use the XPropertySet methods, so the change in the name is notified to the
     // property listeners
-    setFastPropertyValue( HANDLE_BindingID, makeAny( rName ) );
+    setFastPropertyValue( HANDLE_BindingID, Any( rName ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 19eb1b983f4c..00c7bdc39f55 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -161,7 +161,7 @@ public:
     {
         if( !isValidIndex( nIndex ) )
             throw css::lang::IndexOutOfBoundsException();
-        return css::uno::makeAny( getItem( nIndex ) );
+        return css::uno::Any( getItem( nIndex ) );
     }
 
     // XIndexReplace : XIndexAccess
@@ -239,8 +239,8 @@ protected:
         OSL_ENSURE( isValidIndex(nPos), "invalid index" );
         css::container::ContainerEvent aEvent(
             static_cast<css::container::XIndexReplace*>( this ),
-            css::uno::makeAny( nPos ),
-            css::uno::makeAny( getItem( nPos ) ),
+            css::uno::Any( nPos ),
+            css::uno::Any( getItem( nPos ) ),
             css::uno::Any() );
         for (auto const& listener : maListeners)
         {
@@ -253,7 +253,7 @@ protected:
         css::container::ContainerEvent aEvent(
             static_cast<css::container::XIndexReplace*>( this ),
             css::uno::Any(),
-            css::uno::makeAny( aOld ),
+            css::uno::Any( aOld ),
             css::uno::Any() );
         for (auto const& listener : maListeners)
         {
@@ -266,9 +266,9 @@ protected:
         OSL_ENSURE( isValidIndex(nPos), "invalid index" );
         css::container::ContainerEvent aEvent(
             static_cast<css::container::XIndexReplace*>( this ),
-            css::uno::makeAny( nPos ),
-            css::uno::makeAny( getItem( nPos ) ),
-            css::uno::makeAny( aNew ) );
+            css::uno::Any( nPos ),
+            css::uno::Any( getItem( nPos ) ),
+            css::uno::Any( aNew ) );
         for (auto const& listener : maListeners)
         {
             listener->elementReplaced( aEvent );
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 278d5b01f597..d3fbb0718db6 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -33,7 +33,6 @@
 
 using xforms::Convert;
 using com::sun::star::uno::Any;
-using com::sun::star::uno::makeAny;
 using namespace utl;
 
 Convert::Convert()
@@ -111,7 +110,7 @@ namespace
 
     Any lcl_toAny_UNODate( const OUString& rString )
     {
-        return makeAny( lcl_toUNODate( rString ) );
+        return Any( lcl_toUNODate( rString ) );
     }
 
 
@@ -181,7 +180,7 @@ namespace
 
     Any lcl_toAny_UNOTime( const OUString& rString )
     {
-        return makeAny( lcl_toUNOTime( rString ) );
+        return Any( lcl_toUNOTime( rString ) );
     }
 
 
@@ -224,7 +223,7 @@ namespace
             aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours,
             aDate.Day, aDate.Month, aDate.Year, aTime.IsUTC
         );
-        return makeAny( aDateTime );
+        return Any( aDateTime );
     }
 }
 
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 76b9715ee48c..fc446a5a3ecf 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -36,7 +36,6 @@ namespace xforms
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::Type;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::util::VetoException;
     using ::com::sun::star::container::NoSuchElementException;
@@ -166,7 +165,7 @@ namespace xforms
 
     Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName )
     {
-        return makeAny( getDataType( aName ) );
+        return Any( getDataType( aName ) );
     }
 
 
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 2f78df49b747..d4578013cff8 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -38,7 +38,6 @@ namespace xforms
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::Any;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::util::Date;
     using ::com::sun::star::util::Time;
     using ::com::sun::star::util::DateTime;
@@ -111,7 +110,7 @@ namespace xforms
     void SAL_CALL OXSDDataType::setName( const OUString& aName )
     {
         // TODO: check the name for conflicts in the repository
-        setFastPropertyValue( PROPERTY_ID_NAME, makeAny(aName) );
+        setFastPropertyValue( PROPERTY_ID_NAME, Any(aName) );
         SAL_WARN_IF( m_sName != aName, "forms.misc", "OXSDDataType::setName: inconsistency!" );
     }
 
@@ -124,7 +123,7 @@ namespace xforms
 
     void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern )
     {
-        setFastPropertyValue( PROPERTY_ID_XSD_PATTERN, makeAny(_pattern) );
+        setFastPropertyValue( PROPERTY_ID_XSD_PATTERN, Any(_pattern) );
         SAL_WARN_IF( m_sPattern != _pattern, "forms.misc", "OXSDDataType::setPattern: inconsistency!" );
     }
 
@@ -137,7 +136,7 @@ namespace xforms
 
     void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment )
     {
-        setFastPropertyValue( PROPERTY_ID_XSD_WHITESPACE, makeAny(_whitespacetreatment) );
+        setFastPropertyValue( PROPERTY_ID_XSD_WHITESPACE, Any(_whitespacetreatment) );
         SAL_WARN_IF( m_nWST != _whitespacetreatment, "forms.misc", "OXSDDataType::setWhiteSpaceTreatment: inconsistency!" );
     }
 
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 018bec4503f1..616ea8863180 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -510,7 +510,7 @@ css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::f
         pModel->setID( sName );
         pModel->newInstance( OUString(), OUString(), false );
         pModel->initialize();
-        xModels->insertByName( sName, makeAny( xModel ) );
+        xModels->insertByName( sName, Any( xModel ) );
     }
 
     return xModel;
@@ -527,7 +527,7 @@ void Model::renameModel( const Reference<css::frame::XModel>& xCmp,
     {
         Reference<XModel> xModel( xModels->getByName( sFrom ), UNO_QUERY );
         xModel->setID( sTo );
-        xModels->insertByName( sTo, makeAny( xModel ) );
+        xModels->insertByName( sTo, Any( xModel ) );
         xModels->removeByName( sFrom );
     }
 }
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index f5fed0c09572..4cbd99eb43ba 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -93,7 +93,7 @@ public:
     {
         if( !hasItem( aName ) )
             throw css::container::NoSuchElementException();
-        return css::uno::makeAny( getItem( aName ) );
+        return css::uno::Any( getItem( aName ) );
     }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 2ad685c66322..d6ae97405880 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -88,7 +88,7 @@ public:
 
     virtual void getValue( css::uno::Any& rValue ) const override
     {
-        rValue = css::uno::makeAny( (m_pInstance->*m_pReader)() );
+        rValue = css::uno::Any( (m_pInstance->*m_pReader)() );
     }
 
     virtual bool isWriteable() const override
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 6b30ff0f7c3e..d8d81abd5b23 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -368,7 +368,7 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue(
                 aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
 
             Sequence< OUString > aConvertedPrefixes( aPrefixes.data(), aPrefixes.size() );
-            return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
+            return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, Any( aConvertedPrefixes ) );
         }
     }
 
@@ -429,7 +429,7 @@ void SAL_CALL Submission::submitWithInteraction(
             // laboriously create interaction request
             rtl::Reference<comphelper::OInteractionRequest> pRequest
                 = new comphelper::OInteractionRequest(
-                    makeAny( aInvalidDataException ) );
+                    Any( aInvalidDataException ) );
 
             rtl::Reference<comphelper::OInteractionApprove> pContinue
                 = new comphelper::OInteractionApprove();
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 77e628728534..e6154ef619b0 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -64,9 +64,9 @@ CSubmission::SubmissionResult CSubmission::replace(std::u16string_view aReplace,
             // build media descriptor
             Sequence< PropertyValue > descriptor{
                 PropertyValue("InputStream",
-                    -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE),
+                    -1, Any(m_aResultStream), PropertyState_DIRECT_VALUE),
                 PropertyValue("ReadOnly",
-                    -1, makeAny(true), PropertyState_DIRECT_VALUE)
+                    -1, Any(true), PropertyState_DIRECT_VALUE)
             };
 
             OUString aURL = m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);