Just use Any ctor instead of makeAny in framework

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

35 files changed, 147 insertions, 147 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 90b393ace7fd..b2117081c1b1 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1152,7 +1152,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
         {
             xFac.set(xModules, css::uno::UNO_QUERY);
             xInst = xFac->createInstance();
-            xModules->insertByName(m_sModuleCFG, css::uno::makeAny(xInst));
+            xModules->insertByName(m_sModuleCFG, css::uno::Any(xInst));
         }
         xModules->getByName(m_sModuleCFG) >>= xContainer;
     }
@@ -1164,16 +1164,16 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
     {
         xFac.set(xContainer, css::uno::UNO_QUERY);
         xInst = xFac->createInstance();
-        xContainer->insertByName(sKey, css::uno::makeAny(xInst));
+        xContainer->insertByName(sKey, css::uno::Any(xInst));
     }
     xContainer->getByName(sKey) >>= xKey;
 
     xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
     OUString sLocale = impl_ts_getLocale();
     if ( !xCommand->hasByName(sLocale) )
-        xCommand->insertByName(sLocale, css::uno::makeAny(sCommand));
+        xCommand->insertByName(sLocale, css::uno::Any(sCommand));
     else
-        xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand));
+        xCommand->replaceByName(sLocale, css::uno::Any(sCommand));
 }
 
 void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const bool bPreferred )
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index f265f9260828..cfb4e9f971c7 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -381,7 +381,7 @@ void SAL_CALL OReadMenuBarHandler::startElement(
                 initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel, nItemBits );
                 aSubMenuProp.getArray()[2].Value <<= xSubItemContainer;
 
-                m_xMenuBarContainer->insertByIndex( m_xMenuBarContainer->getCount(), makeAny( aSubMenuProp ) );
+                m_xMenuBarContainer->insertByIndex( m_xMenuBarContainer->getCount(), Any( aSubMenuProp ) );
             }
             else
             {
@@ -582,7 +582,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement(
             initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel, nItemBits );
             aSubMenuProp.getArray()[2].Value <<= xSubItemContainer;
 
-            m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aSubMenuProp ) );
+            m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), Any( aSubMenuProp ) );
         }
         else
         {
@@ -638,7 +638,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement(
             initPropertyCommon( aMenuItem, aCommandId, aHelpId, aLabel, nItemBits );
             aMenuItem.getArray()[2].Value <<= Reference< XIndexContainer >();
 
-            m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aMenuItem ) );
+            m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), Any( aMenuItem ) );
         }
 
         m_nNextElementExpected = ELEM_CLOSE_MENUITEM;
@@ -648,7 +648,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement(
         Sequence< PropertyValue > aMenuSeparator{ comphelper::makePropertyValue(
             ITEM_DESCRIPTOR_TYPE, css::ui::ItemType::SEPARATOR_LINE) };
 
-        m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aMenuSeparator ) );
+        m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), Any( aMenuSeparator ) );
 
         m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR;
     }
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index c982267d834b..1621880658bb 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -379,7 +379,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement(
                     comphelper::makePropertyValue(ITEM_DESCRIPTOR_TYPE, css::ui::ItemType::DEFAULT)
                 };
 
-                m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
+                m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), Any( aStatusbarItemProp ) );
            }
         }
         break;
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 9efcc76db60c..3f4bcffe936e 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -230,7 +230,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
                     {
                         try
                         {
-                            xPropSet->setPropertyValue("UIName", makeAny( aUIName ) );
+                            xPropSet->setPropertyValue("UIName", Any( aUIName ) );
                         }
                         catch ( const UnknownPropertyException& )
                         {
@@ -372,14 +372,14 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
                 }
 
                 auto aToolbarItemProp( comphelper::InitPropertySequence( {
-                    { m_aCommandURL, css::uno::makeAny( aCommandURL ) },
-                    { m_aLabel, css::uno::makeAny( aLabel ) },
-                    { m_aType, css::uno::makeAny( css::ui::ItemType::DEFAULT ) },
-                    { m_aStyle, css::uno::makeAny( nItemBits ) },
-                    { m_aIsVisible, css::uno::makeAny( bVisible ) },
+                    { m_aCommandURL, css::uno::Any( aCommandURL ) },
+                    { m_aLabel, css::uno::Any( aLabel ) },
+                    { m_aType, css::uno::Any( css::ui::ItemType::DEFAULT ) },
+                    { m_aStyle, css::uno::Any( nItemBits ) },
+                    { m_aIsVisible, css::uno::Any( bVisible ) },
                 } ) );
 
-                m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
+                m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), Any( aToolbarItemProp ) );
             }
         }
         break;
@@ -402,7 +402,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
                 comphelper::makePropertyValue(m_aType, css::ui::ItemType::SEPARATOR_SPACE)
             };
 
-            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
+            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), Any( aToolbarItemProp ) );
         }
         break;
 
@@ -424,7 +424,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
                 comphelper::makePropertyValue(m_aType, css::ui::ItemType::SEPARATOR_LINEBREAK)
             };
 
-            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
+            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), Any( aToolbarItemProp ) );
         }
         break;
 
@@ -446,7 +446,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
                 comphelper::makePropertyValue(m_aType, css::ui::ItemType::SEPARATOR_LINE)
             };
 
-            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
+            m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), Any( aToolbarItemProp ) );
         }
         break;
 
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 9dee39a6e76d..f9840d52ec3b 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -187,7 +187,7 @@ Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index )
 {
     if ( sal_Int32( m_aItemVector.size()) <= Index )
         throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) );
-    return makeAny( m_aItemVector[Index] );
+    return Any( m_aItemVector[Index] );
 }
 
 // XPropertySet
@@ -207,7 +207,7 @@ void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any&
 Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName )
 {
     if ( PropertyName == PROPNAME_UINAME )
-        return makeAny( m_aUIName );
+        return Any( m_aUIName );
 
     throw UnknownPropertyException(PropertyName);
 }
@@ -239,7 +239,7 @@ void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::un
 Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
 {
     if ( nHandle == PROPHANDLE_UINAME )
-        return makeAny( m_aUIName );
+        return Any( m_aUIName );
 
     throw UnknownPropertyException(OUString::number(nHandle));
 }
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 8cee8440ee41..389bbaeaaf9d 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -160,7 +160,7 @@ Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index )
     if ( sal_Int32( m_aItemVector.size()) <= Index )
         throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) );
 
-    return makeAny( m_aItemVector[Index] );
+    return Any( m_aItemVector[Index] );
 }
 
 // XIndexContainer
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index a91742cb598e..50ecd0d53bde 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -170,7 +170,7 @@ Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index )
     if ( sal_Int32( m_aItemVector.size()) <= Index )
         throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) );
 
-    return makeAny( m_aItemVector[Index] );
+    return Any( m_aItemVector[Index] );
 }
 
 // XIndexContainer
@@ -239,7 +239,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any&       aConve
     {
         case PROPHANDLE_UINAME:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_aUIName),
+                        css::uno::Any(m_aUIName),
                         aValue,
                         aOldValue,
                         aConvertedValue);
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 8121ad025a1c..c9a779a320a4 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -192,7 +192,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(
             "org.openoffice.Setup/",
             OUString::Concat("Office/Factories/*[\"") + sModuleName + "\"]",
             "ooSetupFactoryWindowAttributes",
-            css::uno::makeAny(sWindowState),
+            css::uno::Any(sWindowState),
             ::comphelper::EConfigurationModes::Standard);
     }
     catch(const css::uno::RuntimeException&)
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 43c2eee5975c..95d5b4c65951 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
     {
         case UIELEMENT_PROPHANDLE_CONFIGLISTENER:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_bConfigListener),
+                        css::uno::Any(m_bConfigListener),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_CONFIGSOURCE:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_xConfigSource),
+                        css::uno::Any(m_xConfigSource),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -192,7 +192,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
         {
             Reference< XFrame > xFrame( m_xWeakFrame );
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(xFrame),
+                        css::uno::Any(xFrame),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_PERSISTENT:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_bPersistent),
+                        css::uno::Any(m_bPersistent),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -209,7 +209,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_RESOURCEURL:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_aResourceURL),
+                        css::uno::Any(m_aResourceURL),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_TYPE :
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_nType),
+                        css::uno::Any(m_nType),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -225,7 +225,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_XMENUBAR :
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_xMenuBar),
+                        css::uno::Any(m_xMenuBar),
                         aValue,
                         aOldValue,
                         aConvertedValue);
@@ -233,7 +233,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 
         case UIELEMENT_PROPHANDLE_NOCLOSE:
             bReturn = PropHelper::willPropertyBeChanged(
-                        css::uno::makeAny(m_bNoClose),
+                        css::uno::Any(m_bNoClose),
                         aValue,
                         aOldValue,
                         aConvertedValue);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 292c1a701508..8b8036cf6ea2 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -101,8 +101,8 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N
 
 css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
 {
-    css::uno::Sequence< css::beans::NamedValue > aAnswer { { JobConst::ANSWER_DEACTIVATE_JOB, css::uno::makeAny(true) } };
-    return css::uno::makeAny(aAnswer);
+    css::uno::Sequence< css::beans::NamedValue > aAnswer { { JobConst::ANSWER_DEACTIVATE_JOB, css::uno::Any(true) } };
+    return css::uno::Any(aAnswer);
 }
 
 OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand)
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 9397e7643a28..9220b805c83a 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -693,12 +693,12 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
         if ( xPersistentWindowState->hasByName( aName ))
         {
             Reference< XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
-            xReplace->replaceByName( aName, makeAny( aWindowState ));
+            xReplace->replaceByName( aName, Any( aWindowState ));
         }
         else
         {
             Reference< XNameContainer > xInsert( xPersistentWindowState, uno::UNO_QUERY );
-            xInsert->insertByName( aName, makeAny( aWindowState ));
+            xInsert->insertByName( aName, Any( aWindowState ));
         }
     }
     catch (const Exception&)
@@ -1481,7 +1481,7 @@ void SAL_CALL LayoutManager::createElement( const OUString& aName )
     if ( bNotify )
     {
         // UI element is invisible - provide information to listeners
-        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::Any( aName ) );
     }
 }
 
@@ -1551,7 +1551,7 @@ void SAL_CALL LayoutManager::destroyElement( const OUString& aName )
         doLayout();
 
     if ( bNotify )
-        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::Any( aName ) );
 }
 
 sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL )
@@ -1625,7 +1625,7 @@ sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL )
     }
 
     if ( bNotify )
-        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( rResourceURL ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::Any( rResourceURL ) );
 
     return bResult;
 }
@@ -1753,7 +1753,7 @@ sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName )
         doLayout();
 
     if ( bNotify )
-        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::Any( aName ) );
 
     return bResult;
 }
@@ -1835,7 +1835,7 @@ sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName )
         doLayout();
 
     if ( bNotify )
-        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::Any( aName ) );
 
     return false;
 }
@@ -2523,7 +2523,7 @@ void LayoutManager::implts_createMSCompatibleMenuBar( const OUString& aName )
     assert(xFormsMenuIndex->getCount() >= 1);
     uno::Sequence< beans::PropertyValue > aNewFormsMenu;
     xFormsMenuIndex->getByIndex( 0 ) >>= aNewFormsMenu;
-    xMenuIndex->replaceByIndex(nFormsMenu, uno::makeAny(aNewFormsMenu));
+    xMenuIndex->replaceByIndex(nFormsMenu, uno::Any(aNewFormsMenu));
 
     setMergedMenuBar( xMenuIndex );
 
@@ -2853,7 +2853,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
             if ( xPropSet.is() )
             {
                 if ( Event.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
-                    xPropSet->setPropertyValue( "ConfigurationSource", makeAny( m_xDocCfgMgr ));
+                    xPropSet->setPropertyValue( "ConfigurationSource", Any( m_xDocCfgMgr ));
             }
             xElementSettings->updateSettings();
         }
@@ -2916,7 +2916,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
                     // document settings removed
                     if ( xModuleCfgMgr->hasSettings( Event.ResourceURL ))
                     {
-                        xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xModuleCfgMgr ));
+                        xPropSet->setPropertyValue( aConfigSourcePropName, Any( m_xModuleCfgMgr ));
                         xElementSettings->updateSettings();
                         return;
                     }
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4191f7434f6e..7161a7a26565 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1586,12 +1586,12 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
         if ( xPersistentWindowState->hasByName( aName ))
         {
             uno::Reference< container::XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
-            xReplace->replaceByName( aName, uno::makeAny( aWindowState ));
+            xReplace->replaceByName( aName, uno::Any( aWindowState ));
         }
         else
         {
             uno::Reference< container::XNameContainer > xInsert( xPersistentWindowState, uno::UNO_QUERY );
-            xInsert->insertByName( aName, uno::makeAny( aWindowState ));
+            xInsert->insertByName( aName, uno::Any( aWindowState ));
         }
     }
     catch (const uno::Exception&)
@@ -3150,7 +3150,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData(
                             aDockedPos.X += 1;
 
                         uno::Reference< container::XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
-                        xReplace->replaceByName( rWindowElementName, makeAny( aPropValueSeq ));
+                        xReplace->replaceByName( rWindowElementName, css::uno::Any( aPropValueSeq ));
                     }
                 }
                 catch (const uno::Exception&)
@@ -3773,7 +3773,7 @@ void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEven
         if ( xPropSet.is() )
         {
             if ( rEvent.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
-                xPropSet->setPropertyValue( "ConfigurationSource", makeAny( m_xDocCfgMgr ));
+                xPropSet->setPropertyValue( "ConfigurationSource", css::uno::Any( m_xDocCfgMgr ));
         }
         xElementSettings->updateSettings();
     }
@@ -3857,7 +3857,7 @@ void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent
             // document settings removed
             if ( xModuleCfgMgr->hasSettings( rEvent.ResourceURL ))
             {
-                xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( xModuleCfgMgr ));
+                xPropSet->setPropertyValue( aConfigSourcePropName, css::uno::Any( xModuleCfgMgr ));
                 xElementSettings->updateSettings();
                 return;
             }
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index c1d2eda94b60..ac9bf5c191b9 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -624,7 +624,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     css::uno::Sequence< OUString > lTypesReg { sType };
     css::uno::Sequence< css::beans::NamedValue >           lQuery
     {
-        css::beans::NamedValue(PROP_TYPES, makeAny(lTypesReg))
+        css::beans::NamedValue(PROP_TYPES, css::uno::Any(lTypesReg))
     };
 
     xLoaderFactory = css::frame::FrameLoaderFactory::create(xContext);
@@ -866,7 +866,7 @@ bool LoadEnv::impl_handleContent()
     // query
     css::uno::Sequence< OUString > lTypeReg { sType };
 
-    css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::makeAny(lTypeReg) } };
+    css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::Any(lTypeReg) } };
 
     css::uno::Reference< css::container::XEnumeration > xSet = xLoaderFactory->createSubSetEnumerationByProperties(lQuery);
     while(xSet->hasMoreElements())
@@ -1151,7 +1151,7 @@ bool LoadEnv::impl_loadContent()
         {
             // Set the URL on the frame itself, for the duration of the load, when it has no
             // controller.
-            xTargetFrameProps->setPropertyValue("URL", uno::makeAny(sURL));
+            xTargetFrameProps->setPropertyValue("URL", uno::Any(sURL));
         }
         bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame);
         // react for the result here, so the outside waiting
@@ -1204,7 +1204,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
 
     css::uno::Sequence< OUString > lTypesReg { sType };
 
-    css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::makeAny(lTypesReg) } };
+    css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::Any(lTypesReg) } };
 
     css::uno::Reference< css::container::XEnumeration > xSet = xLoaderFactory->createSubSetEnumerationByProperties(lQuery);
     while(xSet->hasMoreElements())
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 2ceffa8dceb7..86715bda0057 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2025,17 +2025,17 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
             else
                 xCheck->getByName(sID) >>= xSet;
 
-            xSet->setPropertyValue(CFG_ENTRY_PROP_ORIGINALURL, css::uno::makeAny(rInfo.OrgURL       ));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPURL, css::uno::makeAny(rInfo.OldTempURL   ));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPLATEURL, css::uno::makeAny(rInfo.TemplateURL  ));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_FILTER, css::uno::makeAny(rInfo.RealFilter));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE, css::uno::makeAny(sal_Int32(rInfo.DocumentState)));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_MODULE, css::uno::makeAny(rInfo.AppModule));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_TITLE, css::uno::makeAny(rInfo.Title));
-            xSet->setPropertyValue(CFG_ENTRY_PROP_VIEWNAMES, css::uno::makeAny(rInfo.ViewNames));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_ORIGINALURL, css::uno::Any(rInfo.OrgURL       ));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPURL, css::uno::Any(rInfo.OldTempURL   ));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPLATEURL, css::uno::Any(rInfo.TemplateURL  ));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_FILTER, css::uno::Any(rInfo.RealFilter));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE, css::uno::Any(sal_Int32(rInfo.DocumentState)));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_MODULE, css::uno::Any(rInfo.AppModule));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_TITLE, css::uno::Any(rInfo.Title));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_VIEWNAMES, css::uno::Any(rInfo.ViewNames));
 
             if (bNew)
-                xModify->insertByName(sID, css::uno::makeAny(xSet));
+                xModify->insertByName(sID, css::uno::Any(xSet));
         }
     }
     catch(const css::uno::RuntimeException&)
@@ -4121,7 +4121,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&
     {
         css::uno::Reference< css::beans::XPropertySet > xFrameProps(xFrame, css::uno::UNO_QUERY);
         if (xFrameProps.is())
-            xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::makeAny(xExternalProgress));
+            xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::Any(xExternalProgress));
     }
 
     // But inside the MediaDescriptor we must set our own create progress ...
@@ -4152,7 +4152,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&
     // stop progress interception on corresponding frame.
     css::uno::Reference< css::beans::XPropertySet > xFrameProps(xFrame, css::uno::UNO_QUERY);
     if (xFrameProps.is())
-        xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::makeAny(css::uno::Reference< css::task::XStatusIndicator >()));
+        xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::Any(css::uno::Reference< css::task::XStatusIndicator >()));
 
     // forget progress inside list of arguments.
     utl::MediaDescriptor::iterator pArg = rArgs.find(utl::MediaDescriptor::PROP_STATUSINDICATOR);
@@ -4184,7 +4184,7 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL)
     try
     {
         ::ucbhelper::Content aContent(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), m_xContext);
-        aContent.executeCommand("delete", css::uno::makeAny(true));
+        aContent.executeCommand("delete", css::uno::Any(true));
     }
     catch(const css::uno::Exception&)
     {
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index c3d2c79ecdbe..7b9b30214b45 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1335,21 +1335,21 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     {
         case PropHandle::SuspendQuickstartVeto:
                 bReturn = PropHelper::willPropertyBeChanged(
-                    css::uno::makeAny(m_bSuspendQuickstartVeto),
+                    css::uno::Any(m_bSuspendQuickstartVeto),
                     aValue,
                     aOldValue,
                     aConvertedValue);
                 break;
         case PropHandle::DispatchRecorderSupplier :
                 bReturn = PropHelper::willPropertyBeChanged(
-                    css::uno::makeAny(m_xDispatchRecorderSupplier),
+                    css::uno::Any(m_xDispatchRecorderSupplier),
                     aValue,
                     aOldValue,
                     aConvertedValue);
                 break;
         case PropHandle::Title :
                 bReturn = PropHelper::willPropertyBeChanged(
-                    css::uno::makeAny(m_sTitle),
+                    css::uno::Any(m_sTitle),
                     aValue,
                     aOldValue,
                     aConvertedValue);
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index a1e0e745cf54..e5a862b2db43 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3217,7 +3217,7 @@ void XFrameImpl::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::X
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
         xFrameProps->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>= xLayoutManager;
         css::uno::Reference< css::beans::XPropertySet > xLayoutProps(xLayoutManager, css::uno::UNO_QUERY_THROW);
-        xLayoutProps->setPropertyValue(LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, css::uno::makeAny(bState));
+        xLayoutProps->setPropertyValue(LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, css::uno::Any(bState));
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index c03bf2611ecd..ceb8041238be 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -261,7 +261,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
         lProps[sPropName] = xModule->getByName(sPropName);
     }
 
-    return css::uno::makeAny(lProps.getAsConstPropertyValueList());
+    return css::uno::Any(lProps.getAsConstPropertyValueList());
 }
 
 css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
@@ -301,7 +301,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
         {
             ::comphelper::SequenceAsHashMap lModuleProps = getByName(rModuleName);
             if (lModuleProps.match(lSearchProps))
-                lResult.push_back(css::uno::makeAny(lModuleProps.getAsConstPropertyValueList()));
+                lResult.push_back(css::uno::Any(lModuleProps.getAsConstPropertyValueList()));
         }
         catch(const css::uno::Exception&)
         {
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index d092a7102e72..b5c30dc25809 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -638,13 +638,13 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath)
         ::comphelper::ConfigurationHelper::writeRelativeKey(xCfgNew,
                                                             aResubstPath.sPathName,
                                                             CFGPROP_USERPATHS,
-                            css::uno::makeAny(comphelper::containerToSequence(aResubstPath.lUserPaths)));
+                            css::uno::Any(comphelper::containerToSequence(aResubstPath.lUserPaths)));
     }
 
     ::comphelper::ConfigurationHelper::writeRelativeKey(xCfgNew,
                                                         aResubstPath.sPathName,
                                                         CFGPROP_WRITEPATH,
-                                                        css::uno::makeAny(aResubstPath.sWritePath));
+                                                        css::uno::Any(aResubstPath.sWritePath));
 
     ::comphelper::ConfigurationHelper::flush(xCfgNew);
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 01e4cdbce614..1cc16e57e75a 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -179,7 +179,7 @@ void SessionListener::StoreSession( bool bAsync )
         if ( bAsync )
             xDispatch->addStatusListener(this, aURL);
 
-        Sequence< PropertyValue > args{ PropertyValue("DispatchAsynchron",-1,makeAny(bAsync),
+        Sequence< PropertyValue > args{ PropertyValue("DispatchAsynchron",-1,Any(bAsync),
                                                       PropertyState_DIRECT_VALUE) };
         xDispatch->dispatch(aURL, args);
     } catch (const css::uno::Exception&) {
@@ -207,7 +207,7 @@ void SessionListener::QuitSessionQuietly()
         aURL.Complete = "vnd.sun.star.autorecovery:/doSessionQuietQuit";
         xURLTransformer->parseStrict(aURL);
 
-        Sequence< PropertyValue > args{ PropertyValue("DispatchAsynchron",-1,makeAny(false),
+        Sequence< PropertyValue > args{ PropertyValue("DispatchAsynchron",-1,Any(false),
                                                       PropertyState_DIRECT_VALUE) };
         xDispatch->dispatch(aURL, args);
     } catch (const css::uno::Exception&) {
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 809cc88b877c..6812f5604c26 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -45,7 +45,7 @@ uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName )
     NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
     if ( pIter == m_aNameToElementMap.end() )
         throw container::NoSuchElementException();
-    return uno::makeAny( pIter->second );
+    return uno::Any( pIter->second );
 }
 
 uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames()
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 62c19b2e1c44..ac7a10b90142 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -555,7 +555,7 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
         }
     }
 
-    return makeAny( comphelper::containerToSequence(aPropVec) );
+    return Any( comphelper::containerToSequence(aPropVec) );
 }
 
 Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess > const & xNameAccess )
@@ -751,7 +751,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
 
     aWindowStateInfo.nMask = nMask;
     m_aResourceURLToInfoCache.emplace( rResourceURL, aWindowStateInfo );
-    return makeAny( comphelper::containerToSequence(aPropVec) );
+    return Any( comphelper::containerToSequence(aPropVec) );
 }
 
 ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess > const & rNameAccess )
@@ -1127,23 +1127,23 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
                 switch ( i )
                 {
                     case PROPERTY_LOCKED:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bLocked ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bLocked ) ); break;
                     case PROPERTY_DOCKED:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bDocked ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bDocked ) ); break;
                     case PROPERTY_VISIBLE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bVisible ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bVisible ) ); break;
                     case PROPERTY_CONTEXT:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bContext ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bContext ) ); break;
                     case PROPERTY_HIDEFROMMENU:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bHideFromMenu ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bHideFromMenu ) ); break;
                     case PROPERTY_NOCLOSE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bNoClose ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bNoClose ) ); break;
                     case PROPERTY_SOFTCLOSE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bSoftClose ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bSoftClose ) ); break;
                     case PROPERTY_CONTEXTACTIVE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bContextActive ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.bContextActive ) ); break;
                     case PROPERTY_DOCKINGAREA:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Int16( rWinStateInfo.aDockingArea ) ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( sal_Int16( rWinStateInfo.aDockingArea ) ) ); break;
                     case PROPERTY_POS:
                     case PROPERTY_DOCKPOS:
                     {
@@ -1157,7 +1157,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
                             aPosStr += OUString::number( rWinStateInfo.aPos.Y );
                         else
                             aPosStr += OUString::number( rWinStateInfo.aDockPos.Y );
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aPosStr ) );
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( aPosStr ) );
                         break;
                     }
                     case PROPERTY_SIZE:
@@ -1173,15 +1173,15 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
                             aSizeStr += OUString::number( rWinStateInfo.aSize.Height );
                         else
                             aSizeStr += OUString::number( rWinStateInfo.aDockSize.Height );
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aSizeStr ) );
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( aSizeStr ) );
                         break;
                     }
                     case PROPERTY_UINAME:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.aUIName ) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( rWinStateInfo.aUIName ) ); break;
                     case PROPERTY_INTERNALSTATE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Int32( rWinStateInfo.nInternalState )) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( sal_Int32( rWinStateInfo.nInternalState )) ); break;
                     case PROPERTY_STYLE:
-                        xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Int32( rWinStateInfo.nStyle )) ); break;
+                        xPropSet->setPropertyValue( m_aPropArray[i], Any( sal_Int32( rWinStateInfo.nStyle )) ); break;
                     default:
                        assert( false && "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
                 }
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 0bc03db8de69..77d6e3e8c839 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -249,7 +249,7 @@ void ComboboxToolbarController::executeControlCommand( const css::frame::Control
                     m_pComboBox->append_text(rName);
 
                 // send notification
-                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
+                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::Any(aList) } };
                 addNotifyInfo( "ListChanged",
                                getDispatchFromCommand( m_aCommandURL ),
                                aInfo );
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index fb902ed17d1e..c3f9f191df0e 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -315,7 +315,7 @@ void ComplexToolbarController::notifyFocusLost()
 void ComplexToolbarController::notifyTextChanged( const OUString& aText )
 {
     // send text changed notification
-    uno::Sequence< beans::NamedValue > aInfo { { "Text", css::uno::makeAny(aText) } };
+    uno::Sequence< beans::NamedValue > aInfo { { "Text", css::uno::Any(aText) } };
     addNotifyInfo( "TextChanged",
                    getDispatchFromCommand( m_aCommandURL ),
                    aInfo );
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index ae4b14ab2055..b3478a7b1edb 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -198,7 +198,7 @@ void DropdownToolbarController::executeControlCommand( const css::frame::Control
                 m_pListBoxControl->set_active(0);
 
                 // send notification
-                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
+                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::Any(aList) } };
                 addNotifyInfo( "ListChanged",
                                getDispatchFromCommand( m_aCommandURL ),
                                aInfo );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index f375e318106b..1ab3c0cf8de1 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -104,7 +104,7 @@ void ImageButtonToolbarController::executeControlCommand( const css::frame::Cont
                 m_xToolbar->SetItemImage( m_nID, aImage );
 
                 // send notification
-                uno::Sequence< beans::NamedValue > aInfo { { "URL", css::uno::makeAny(aURL) } };
+                uno::Sequence< beans::NamedValue > aInfo { { "URL", css::uno::Any(aURL) } };
                 addNotifyInfo( "ImageChanged",
                             getDispatchFromCommand( m_aCommandURL ),
                             aInfo );
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c363ccffb9b6..690b54240436 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -873,10 +873,10 @@ bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandle
         return false;
 
     auto aSeq( comphelper::InitAnyPropertySequence( {
-        { "DispatchProvider", makeAny(rDispatchProvider) },
-        { "ModuleIdentifier", makeAny(rModuleIdentifier) },
-        { "Frame", makeAny(m_xFrame) },
-        { "InToolbar", makeAny(!m_bHasMenuBar) }
+        { "DispatchProvider", Any(rDispatchProvider) },
+        { "ModuleIdentifier", Any(rModuleIdentifier) },
+        { "Frame", Any(m_xFrame) },
+        { "InToolbar", Any(!m_bHasMenuBar) }
     } ) );
 
     Reference< XPopupMenuController > xPopupMenuController(
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 6f67deef0392..928e45f1e285 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -305,7 +305,7 @@ Any SAL_CALL MenuBarWrapper::getByName(
         throw container::NoSuchElementException();
 
     uno::Reference< frame::XDispatchProvider > xDispatchProvider = pIter->second.m_xDispatchProvider;
-    return uno::makeAny( xDispatchProvider );
+    return uno::Any( xDispatchProvider );
 }
 
 Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames()
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 62ac260f6c77..0d49dc5dd7ee 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -239,9 +239,9 @@ void PopupMenuToolbarController::createPopupMenuController()
     else
     {
         css::uno::Sequence<css::uno::Any> aArgs {
-            css::uno::makeAny(comphelper::makePropertyValue("Frame", m_xFrame)),
-            css::uno::makeAny(comphelper::makePropertyValue("ModuleIdentifier", m_sModuleName)),
-            css::uno::makeAny(comphelper::makePropertyValue("InToolbar", true))
+            css::uno::Any(comphelper::makePropertyValue("Frame", m_xFrame)),
+            css::uno::Any(comphelper::makePropertyValue("ModuleIdentifier", m_sModuleName)),
+            css::uno::Any(comphelper::makePropertyValue("InToolbar", true))
         };
 
         try
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 7c6de5518b98..929afb24ca94 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -300,33 +300,33 @@ void StatusBarManager::CreateControllers()
 
         aPropValue.Name     = "CommandURL";
         aPropValue.Value    <<= aCommandURL;
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         aPropValue.Name     = "ModuleIdentifier";
         aPropValue.Value    <<= OUString();
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         aPropValue.Name     = "Frame";
         aPropValue.Value    <<= m_xFrame;
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         // TODO remove this
         aPropValue.Name     = "ServiceManager";
         aPropValue.Value    <<= uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         aPropValue.Name     = "ParentWindow";
         aPropValue.Value    <<= xStatusbarWindow;
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         // TODO still needing with the css::ui::XStatusbarItem?
         aPropValue.Name     = "Identifier";
         aPropValue.Value    <<= nId;
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         aPropValue.Name     = "StatusbarItem";
         aPropValue.Value    <<= xStatusbarItem;
-        aPropVector.push_back( uno::makeAny( aPropValue ) );
+        aPropVector.push_back( uno::Any( aPropValue ) );
 
         uno::Sequence< uno::Any > aArgs( comphelper::containerToSequence( aPropVector ) );
 
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index e02e4631bd6b..c5aed8f7bf59 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -199,7 +199,7 @@ void SubToolBarController::execute( sal_Int16 nKeyModifier )
     if ( !m_aLastCommand.isEmpty() )
     {
         auto aArgs( comphelper::InitPropertySequence( {
-            { "KeyModifier", css::uno::makeAny( nKeyModifier ) }
+            { "KeyModifier", css::uno::Any( nKeyModifier ) }
         } ) );
         dispatchCommand( m_aLastCommand, aArgs );
     }
@@ -253,10 +253,10 @@ std::unique_ptr<WeldToolbarPopup> SubToolBarController::weldPopupWindow()
     css::uno::Reference< css::awt::XWindow > xParent = new weld::TransportAsXWindow(pPopup->GetContainer());
 
     auto aPropSeq( comphelper::InitPropertySequence( {
-        { "Frame", css::uno::makeAny( xFrame ) },
-        { "ParentWindow", css::uno::makeAny( xParent ) },
-        { "Persistent", css::uno::makeAny( false ) },
-        { "PopupMode", css::uno::makeAny( true ) }
+        { "Frame", css::uno::Any( xFrame ) },
+        { "ParentWindow", css::uno::Any( xParent ) },
+        { "Persistent", css::uno::Any( false ) },
+        { "PopupMode", css::uno::Any( true ) }
     } ) );
 
     try
@@ -296,10 +296,10 @@ VclPtr<vcl::Window> SubToolBarController::createVclPopupWindow(vcl::Window* /*pP
         }
 
         auto aPropSeq( comphelper::InitPropertySequence( {
-            { "Frame", css::uno::makeAny( xFrame ) },
-            { "ParentWindow", css::uno::makeAny( m_xParentWindow ) },
-            { "Persistent", css::uno::makeAny( false ) },
-            { "PopupMode", css::uno::makeAny( true ) }
+            { "Frame", css::uno::Any( xFrame ) },
+            { "ParentWindow", css::uno::Any( m_xParentWindow ) },
+            { "Persistent", css::uno::Any( false ) },
+            { "PopupMode", css::uno::Any( true ) }
         } ) );
 
         try
@@ -454,7 +454,7 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
         {
             OUString aPersistentString( "Persistent" );
             css::uno::Any a = xProp->getPropertyValue( aPersistentString );
-            xProp->setPropertyValue( aPersistentString, css::uno::makeAny( false ) );
+            xProp->setPropertyValue( aPersistentString, css::uno::Any( false ) );
 
             xLayoutManager->hideElement( aSubToolBarResName );
             xLayoutManager->floatWindow( aSubToolBarResName );
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 37f65a336404..c17b08efeeb7 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -120,7 +120,7 @@ void ToggleButtonToolbarController::executeControlCommand( const css::frame::Con
                 }
 
                 // send notification
-                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
+                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::Any(aList) } };
                 addNotifyInfo( "ListChanged",
                             getDispatchFromCommand( m_aCommandURL ),
                             aInfo );
@@ -145,7 +145,7 @@ void ToggleButtonToolbarController::executeControlCommand( const css::frame::Con
                     m_aCurrentSelection = m_aDropdownMenuList[nPos].mLabel;
 
                     // send notification
-                    uno::Sequence< beans::NamedValue > aInfo { { "ItemChecked", css::uno::makeAny(nPos) } };
+                    uno::Sequence< beans::NamedValue > aInfo { { "ItemChecked", css::uno::Any(nPos) } };
                     addNotifyInfo( "Pos",
                                 getDispatchFromCommand( m_aCommandURL ),
                                 aInfo );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 6c88c57d8b27..88bba421ff1c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1095,20 +1095,20 @@ void ToolBarManager::CreateControllers()
 
             aPropValue.Name     = "ModuleIdentifier";
             aPropValue.Value    <<= m_aModuleIdentifier;
-            aPropertyVector.push_back( makeAny( aPropValue ));
+            aPropertyVector.push_back( Any( aPropValue ));
             aPropValue.Name     = "Frame";
             aPropValue.Value    <<= m_xFrame;
-            aPropertyVector.push_back( makeAny( aPropValue ));
+            aPropertyVector.push_back( Any( aPropValue ));
             aPropValue.Name     = "ServiceManager";
             Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW);
             aPropValue.Value    <<= xMSF;
-            aPropertyVector.push_back( makeAny( aPropValue ));
+            aPropertyVector.push_back( Any( aPropValue ));
             aPropValue.Name     = "ParentWindow";
             aPropValue.Value    <<= xToolbarWindow;
-            aPropertyVector.push_back( makeAny( aPropValue ));
+            aPropertyVector.push_back( Any( aPropValue ));
             aPropValue.Name     = "Identifier";
             aPropValue.Value    <<= sal_uInt16(nId);
-            aPropertyVector.push_back( uno::makeAny( aPropValue ) );
+            aPropertyVector.push_back( uno::Any( aPropValue ) );
 
             Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
             xController.set( m_xToolbarControllerFactory->createInstanceWithArgumentsAndContext( aCommandURL, aArgs, m_xContext ),
@@ -1199,23 +1199,23 @@ void ToolBarManager::CreateControllers()
 
                 aPropValue.Name = "Frame";
                 aPropValue.Value <<= m_xFrame;
-                aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropertyVector.push_back( Any( aPropValue ));
                 aPropValue.Name = "CommandURL";
                 aPropValue.Value <<= aCommandURL;
-                aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropertyVector.push_back( Any( aPropValue ));
                 aPropValue.Name = "ServiceManager";
                 Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW);
                 aPropValue.Value <<= xMSF;
-                aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropertyVector.push_back( Any( aPropValue ));
                 aPropValue.Name = "ParentWindow";
                 aPropValue.Value <<= xToolbarWindow;
-                aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropertyVector.push_back( Any( aPropValue ));
                 aPropValue.Name = "ModuleIdentifier";
                 aPropValue.Value <<= m_aModuleIdentifier;
-                aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropertyVector.push_back( Any( aPropValue ));
                 aPropValue.Name     = "Identifier";
                 aPropValue.Value    <<= sal_uInt16(nId);
-                aPropertyVector.push_back( uno::makeAny( aPropValue ) );
+                aPropertyVector.push_back( uno::Any( aPropValue ) );
 
                 Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
                 xInit->initialize( aArgs );
@@ -1223,7 +1223,7 @@ void ToolBarManager::CreateControllers()
                 if (pController)
                 {
                     if (aCommandURL == ".uno:SwitchXFormsDesignMode" || aCommandURL == ".uno:ViewDataSourceBrowser")
-                        pController->setFastPropertyValue_NoBroadcast(1, makeAny(true));
+                        pController->setFastPropertyValue_NoBroadcast(1, Any(true));
                 }
             }
 
@@ -2207,7 +2207,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
                                         aProp.getArray()[nVisibleIndex].Value <<= !bVisible;
                                         try
                                         {
-                                            xItemContainer->replaceByIndex( i, makeAny( aProp ));
+                                            xItemContainer->replaceByIndex( i, Any( aProp ));
                                             xUIElementSettings->setSettings( xItemContainer );
                                             Reference< XPropertySet > xPropSet( xUIElementSettings, UNO_QUERY );
                                             if ( xPropSet.is() )
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 0bc41af3e05c..1740bf1f1405 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -214,7 +214,7 @@ void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent&
 // XMenuListener
 void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
-    auto aArgs(comphelper::InitPropertySequence({{"Mode", makeAny(m_xPopupMenu->getCommand(rEvent.MenuId))}}));
+    auto aArgs(comphelper::InitPropertySequence({{"Mode", Any(m_xPopupMenu->getCommand(rEvent.MenuId))}}));
     dispatchCommand(m_aCommandURL, aArgs);
 }
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 73e3689e4714..730190240334 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -571,7 +571,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
                             {
                                 // Default is: Every context sensitive toolbar is visible
                                 aWindowState.getArray()[nVisibleIndex].Value <<= true;
-                                xNameReplace->replaceByName( aElementName, makeAny( aWindowState ));
+                                xNameReplace->replaceByName( aElementName, Any( aWindowState ));
                                 bRefreshToolbars = true;
                             }
                         }
@@ -591,7 +591,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
                         {
                             try
                             {
-                                xPropSet->setPropertyValue("RefreshContextToolbarVisibility", makeAny( true ));
+                                xPropSet->setPropertyValue("RefreshContextToolbarVisibility", Any( true ));
                             }
                             catch ( const RuntimeException& )
                             {
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 9f81afced1a7..793bc9db8fe0 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -203,11 +203,11 @@ Any ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
         addGenericInfoToCache();
 
         if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ))
-            return makeAny( m_aCommandImageList );
+            return Any( m_aCommandImageList );
         else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))
-            return makeAny( m_aCommandRotateImageList );
+            return Any( m_aCommandRotateImageList );
         else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))
-            return makeAny( m_aCommandMirrorImageList );
+            return Any( m_aCommandMirrorImageList );
         else
             return Any();
     }
@@ -268,8 +268,8 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman
 
         Sequence< PropertyValue > aPropSeq{
             comphelper::makePropertyValue("Label", !pIter->second.aContextLabel.isEmpty()
-                                                       ? makeAny(pIter->second.aContextLabel)
-                                                       : makeAny(pIter->second.aLabel)),
+                                                       ? Any(pIter->second.aContextLabel)
+                                                       : Any(pIter->second.aLabel)),
             comphelper::makePropertyValue("Name", pIter->second.aCommandName),
             comphelper::makePropertyValue("Popup", pIter->second.bPopup),
             comphelper::makePropertyValue(m_aPropProperties, pIter->second.nProperties),
@@ -278,7 +278,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman
             comphelper::makePropertyValue("TargetURL", pIter->second.aTargetURL),
             comphelper::makePropertyValue("IsExperimental", pIter->second.bIsExperimental)
         };
-        return makeAny( aPropSeq );
+        return Any( aPropSeq );
     }
 
     return Any();