new loplugin unoany

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

19 files changed, 85 insertions, 85 deletions

diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index b04a4caf41cd..1805d4b93f43 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -141,7 +141,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL,
     // return the model - like loadComponentFromURL()
     css::uno::Any aRet;
     if ( xComponent.is () )
-        aRet = css::uno::makeAny( xComponent );
+        aRet <<= xComponent;
 
     return aRet;
 }
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 18863a28e5aa..2122c3949400 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -381,7 +381,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement(
                             aStatusbarItemProp[2].Value <<= nOffset;
                             aStatusbarItemProp[3].Value <<= nItemBits;
                             aStatusbarItemProp[4].Value <<= nWidth;
-                            aStatusbarItemProp[5].Value = makeAny( css::ui::ItemType::DEFAULT );
+                            aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT;
 
                             m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
                        }
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 92404ddcb818..a108baaa287f 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -310,7 +310,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp
 
         css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
         aArgs[0].Name  = aDockWinArgName;
-        aArgs[0].Value = css::uno::makeAny( bVisible );
+        aArgs[0].Value <<= bVisible;
 
         css::uno::Reference< css::frame::XDispatchHelper > xDispatcher = css::frame::DispatchHelper::create( rxContext );
 
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 425b57879739..1243f2d88205 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -655,12 +655,12 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
             Sequence< PropertyValue > aWindowState( 8 );
 
             aWindowState[0].Name  = WINDOWSTATE_PROPERTY_DOCKED;
-            aWindowState[0].Value = makeAny( !rElementData.m_bFloating );
+            aWindowState[0].Value <<= !rElementData.m_bFloating;
             aWindowState[1].Name  = WINDOWSTATE_PROPERTY_VISIBLE;
-            aWindowState[1].Value = makeAny( rElementData.m_bVisible );
+            aWindowState[1].Value <<= rElementData.m_bVisible;
 
             aWindowState[2].Name  = WINDOWSTATE_PROPERTY_DOCKINGAREA;
-            aWindowState[2].Value = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+            aWindowState[2].Value <<= static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea );
 
             aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS;
             aWindowState[3].Value <<= rElementData.m_aDockedData.m_aPos;
@@ -671,9 +671,9 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
             aWindowState[5].Name  = WINDOWSTATE_PROPERTY_SIZE;
             aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
             aWindowState[6].Name  = WINDOWSTATE_PROPERTY_UINAME;
-            aWindowState[6].Value = makeAny( rElementData.m_aUIName );
+            aWindowState[6].Value <<= rElementData.m_aUIName;
             aWindowState[7].Name  = WINDOWSTATE_PROPERTY_LOCKED;
-            aWindowState[7].Value = makeAny( rElementData.m_aDockedData.m_bLocked );
+            aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked;
 
             if ( xPersistentWindowState->hasByName( aName ))
             {
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4f69df830dcb..98edc791193e 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1593,11 +1593,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
             uno::Sequence< beans::PropertyValue > aWindowState( 9 );
 
             aWindowState[0].Name  = WINDOWSTATE_PROPERTY_DOCKED;
-            aWindowState[0].Value = ::uno::makeAny( !rElementData.m_bFloating );
+            aWindowState[0].Value <<= !rElementData.m_bFloating;
             aWindowState[1].Name  = WINDOWSTATE_PROPERTY_VISIBLE;
-            aWindowState[1].Value = uno::makeAny( rElementData.m_bVisible );
+            aWindowState[1].Value <<= rElementData.m_bVisible;
             aWindowState[2].Name  = WINDOWSTATE_PROPERTY_DOCKINGAREA;
-            aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+            aWindowState[2].Value <<= static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea );
 
             awt::Point aPos = rElementData.m_aDockedData.m_aPos;
             aWindowState[3].Name  = WINDOWSTATE_PROPERTY_DOCKPOS;
@@ -1610,11 +1610,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
             aWindowState[5].Name  = WINDOWSTATE_PROPERTY_SIZE;
             aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
             aWindowState[6].Name  = WINDOWSTATE_PROPERTY_UINAME;
-            aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
+            aWindowState[6].Value <<= rElementData.m_aUIName;
             aWindowState[7].Name  = WINDOWSTATE_PROPERTY_LOCKED;
-            aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
+            aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked;
             aWindowState[8].Name  = WINDOWSTATE_PROPERTY_STYLE;
-            aWindowState[8].Value = uno::makeAny( static_cast<sal_uInt16>(rElementData.m_nStyle) );
+            aWindowState[8].Value <<= static_cast<sal_uInt16>(rElementData.m_nStyle);
 
             OUString aName = rElementData.m_aName;
             if ( xPersistentWindowState->hasByName( aName ))
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index f18f85055de6..d77774cc7308 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2799,7 +2799,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*
                 {
                     css::uno::Reference< css::task::XStatusIndicator > xProgress(m_xIndicatorInterception.get(),
                                                                                  css::uno::UNO_QUERY);
-                    aValue = css::uno::makeAny(xProgress);
+                    aValue <<= xProgress;
                 }
                 break;
 
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 87e3f23340f6..a1d3f8bff5ed 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -126,8 +126,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstan
         css::uno::Sequence< css::uno::Any > aArgs( 1 );
 
         aPropValue.Name  = aTopWindowArgName;
-        aPropValue.Value = css::uno::makeAny( xTopWindow );
-        aArgs[0] = css::uno::makeAny( aPropValue );
+        aPropValue.Value <<= xTopWindow;
+        aArgs[0] <<= aPropValue;
         pTabWindow->initialize( aArgs );
 
         xReturn.set( static_cast< OWeakObject* >( pTabWindow ), css::uno::UNO_QUERY );
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 94df703b3140..8cc4316d8669 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -201,11 +201,11 @@ void GlobalSettings_Access::impl_initConfigAccess()
                  css::configuration::theDefaultProvider::get( m_xContext );
 
             aPropValue.Name  = "nodepath";
-            aPropValue.Value = css::uno::makeAny(OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars"));
-            aArgs[0] = css::uno::makeAny( aPropValue );
+            aPropValue.Value <<= OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars");
+            aArgs[0] <<= aPropValue;
             aPropValue.Name = "lazywrite";
-            aPropValue.Value = css::uno::makeAny( true );
-            aArgs[1] = css::uno::makeAny( aPropValue );
+            aPropValue.Value <<= true;
+            aArgs[1] <<= aPropValue;
 
             m_xConfigAccess.set(xConfigProvider->createInstanceWithArguments(
                                     SERVICENAME_CFGREADACCESS, aArgs ),
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index d970bea83838..fccf5977c8d0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -838,8 +838,8 @@ void ImageManagerImpl::replaceImages(
         aInsertEvent.Accessor        <<= xOwner;
         aInsertEvent.Source          = xOwner;
         aInsertEvent.ResourceURL     = m_aResourceString;
-        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+        aInsertEvent.Element         <<= uno::Reference< XNameAccess >(
+                                           static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY );
         implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
     }
     if ( pReplacedImages != nullptr )
@@ -850,8 +850,8 @@ void ImageManagerImpl::replaceImages(
         aReplaceEvent.Source          = xOwner;
         aReplaceEvent.ResourceURL     = m_aResourceString;
         aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+        aReplaceEvent.Element         <<= uno::Reference< XNameAccess >(
+                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
         implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
     }
 }
@@ -934,24 +934,24 @@ void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUS
     if ( pRemovedImages != nullptr )
     {
         ConfigurationEvent aRemoveEvent;
-        aRemoveEvent.aInfo           = uno::makeAny( nImageType );
-        aRemoveEvent.Accessor        = uno::makeAny( xOwner );
+        aRemoveEvent.aInfo           <<= nImageType;
+        aRemoveEvent.Accessor        <<= xOwner;
         aRemoveEvent.Source          = xOwner;
         aRemoveEvent.ResourceURL     = m_aResourceString;
-        aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+        aRemoveEvent.Element         <<= uno::Reference< XNameAccess >(
+                                            static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY );
         implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
     }
     if ( pReplacedImages != nullptr )
     {
         ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xOwner );
+        aReplaceEvent.aInfo           <<= nImageType;
+        aReplaceEvent.Accessor        <<= xOwner;
         aReplaceEvent.Source          = xOwner;
         aReplaceEvent.ResourceURL     = m_aResourceString;
         aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+        aReplaceEvent.Element         <<= uno::Reference< XNameAccess >(
+                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
         implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
     }
 }
@@ -1073,35 +1073,35 @@ void ImageManagerImpl::reload()
                 if ( pInsertedImages != nullptr )
                 {
                     ConfigurationEvent aInsertEvent;
-                    aInsertEvent.aInfo           = uno::makeAny( (sal_uInt16)i );
-                    aInsertEvent.Accessor        = uno::makeAny( xOwner );
+                    aInsertEvent.aInfo           <<=(sal_uInt16)i;
+                    aInsertEvent.Accessor        <<= xOwner;
                     aInsertEvent.Source          = xOwner;
                     aInsertEvent.ResourceURL     = m_aResourceString;
-                    aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                                    static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+                    aInsertEvent.Element         <<= uno::Reference< XNameAccess >(
+                                                       static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY );
                     implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
                 }
                 if ( pReplacedImages != nullptr )
                 {
                     ConfigurationEvent aReplaceEvent;
-                    aReplaceEvent.aInfo           = uno::makeAny( (sal_uInt16)i );
-                    aReplaceEvent.Accessor        = uno::makeAny( xOwner );
+                    aReplaceEvent.aInfo           <<= (sal_uInt16)i;
+                    aReplaceEvent.Accessor        <<= xOwner;
                     aReplaceEvent.Source          = xOwner;
                     aReplaceEvent.ResourceURL     = m_aResourceString;
                     aReplaceEvent.ReplacedElement = Any();
-                    aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                                    static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+                    aReplaceEvent.Element         <<= uno::Reference< XNameAccess >(
+                                                    static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
                     implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
                 }
                 if ( pRemovedImages != nullptr )
                 {
                     ConfigurationEvent aRemoveEvent;
-                    aRemoveEvent.aInfo           = uno::makeAny( (sal_uInt16)i );
-                    aRemoveEvent.Accessor        = uno::makeAny( xOwner );
+                    aRemoveEvent.aInfo           <<= (sal_uInt16)i;
+                    aRemoveEvent.Accessor        <<= xOwner;
                     aRemoveEvent.Source          = xOwner;
                     aRemoveEvent.ResourceURL     = m_aResourceString;
-                    aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                                        static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+                    aRemoveEvent.Element         <<= uno::Reference< XNameAccess >(
+                                                        static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY );
                     implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
                 }
 
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 5cd3fc0a2739..6d8c08516efc 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1450,14 +1450,14 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
         Sequence< Any > aPropSeq( 3 );
         PropertyValue aPropValue;
         aPropValue.Name  = "UserConfigStorage";
-        aPropValue.Value = makeAny( m_xUserConfigStorage );
-        aPropSeq[0] = makeAny( aPropValue );
+        aPropValue.Value <<= m_xUserConfigStorage;
+        aPropSeq[0] <<= aPropValue;
         aPropValue.Name  = "ModuleIdentifier";
-        aPropValue.Value = makeAny( m_aModuleIdentifier );
-        aPropSeq[1] = makeAny( aPropValue );
+        aPropValue.Value <<= m_aModuleIdentifier;
+        aPropSeq[1] <<= aPropValue;
         aPropValue.Name  = "UserRootCommit";
-        aPropValue.Value = makeAny( m_xUserRootCommit );
-        aPropSeq[2] = makeAny( aPropValue );
+        aPropValue.Value <<= m_xUserRootCommit;
+        aPropSeq[2] <<= aPropValue;
 
         xInit->initialize( aPropSeq );
     }
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 65955e025e66..d38377387376 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1142,11 +1142,11 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager()
         Sequence< Any > aPropSeq( 2 );
         PropertyValue aPropValue;
         aPropValue.Name  = "UserConfigStorage";
-        aPropValue.Value = makeAny( m_xDocConfigStorage );
-        aPropSeq[0] = makeAny( aPropValue );
+        aPropValue.Value <<= m_xDocConfigStorage;
+        aPropSeq[0] <<= aPropValue;
         aPropValue.Name  = "ModuleIdentifier";
-        aPropValue.Value = makeAny( m_aModuleIdentifier );
-        aPropSeq[1] = makeAny( aPropValue );
+        aPropValue.Value <<= m_aModuleIdentifier;
+        aPropSeq[1] <<= aPropValue;
 
         xInit->initialize( aPropSeq );
     }
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 9194f45ccdc6..13ee80120597 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -532,37 +532,37 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
             switch ( i )
             {
                 case PROPERTY_LOCKED:
-                    pv.Value = makeAny( rWinStateInfo.bLocked ); break;
+                    pv.Value <<= rWinStateInfo.bLocked; break;
                 case PROPERTY_DOCKED:
-                    pv.Value = makeAny( rWinStateInfo.bDocked ); break;
+                    pv.Value <<= rWinStateInfo.bDocked; break;
                 case PROPERTY_VISIBLE:
-                    pv.Value = makeAny( rWinStateInfo.bVisible ); break;
+                    pv.Value <<= rWinStateInfo.bVisible; break;
                 case PROPERTY_CONTEXT:
-                    pv.Value = makeAny( rWinStateInfo.bContext ); break;
+                    pv.Value <<= rWinStateInfo.bContext; break;
                 case PROPERTY_HIDEFROMMENU:
-                    pv.Value = makeAny( rWinStateInfo.bHideFromMenu ); break;
+                    pv.Value <<= rWinStateInfo.bHideFromMenu; break;
                 case PROPERTY_NOCLOSE:
-                    pv.Value = makeAny( rWinStateInfo.bNoClose ); break;
+                    pv.Value <<= rWinStateInfo.bNoClose; break;
                 case PROPERTY_SOFTCLOSE:
-                    pv.Value = makeAny( rWinStateInfo.bSoftClose ); break;
+                    pv.Value <<= rWinStateInfo.bSoftClose; break;
                 case PROPERTY_CONTEXTACTIVE:
-                    pv.Value = makeAny( rWinStateInfo.bContextActive ); break;
+                    pv.Value <<= rWinStateInfo.bContextActive; break;
                 case PROPERTY_DOCKINGAREA:
-                    pv.Value = makeAny( rWinStateInfo.aDockingArea ); break;
+                    pv.Value <<= rWinStateInfo.aDockingArea; break;
                 case PROPERTY_POS:
-                    pv.Value = makeAny( rWinStateInfo.aPos ); break;
+                    pv.Value <<= rWinStateInfo.aPos; break;
                 case PROPERTY_SIZE:
-                    pv.Value = makeAny( rWinStateInfo.aSize ); break;
+                    pv.Value <<= rWinStateInfo.aSize; break;
                 case PROPERTY_UINAME:
-                    pv.Value = makeAny( rWinStateInfo.aUIName ); break;
+                    pv.Value <<= rWinStateInfo.aUIName; break;
                 case PROPERTY_INTERNALSTATE:
-                    pv.Value = makeAny( sal_Int32( rWinStateInfo.nInternalState )); break;
+                    pv.Value <<= sal_Int32( rWinStateInfo.nInternalState ); break;
                 case PROPERTY_STYLE:
-                    pv.Value = makeAny( sal_Int16( rWinStateInfo.nStyle )); break;
+                    pv.Value <<= sal_Int16( rWinStateInfo.nStyle ); break;
                 case PROPERTY_DOCKPOS:
-                    pv.Value = makeAny( rWinStateInfo.aDockPos ); break;
+                    pv.Value <<= rWinStateInfo.aDockPos; break;
                 case PROPERTY_DOCKSIZE:
-                    pv.Value = makeAny( rWinStateInfo.aDockSize ); break;
+                    pv.Value <<= rWinStateInfo.aDockSize; break;
                 default:
                     assert( false && "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
             }
@@ -637,7 +637,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
                         {
                             aWindowStateInfo.aDockingArea = (DockingArea)nDockingArea;
                             nMask |= WINDOWSTATE_MASK_DOCKINGAREA;
-                            a = makeAny( aWindowStateInfo.aDockingArea );
+                            a <<= aWindowStateInfo.aDockingArea;
                             bAddToSeq = true;
                         }
                     }
@@ -1361,7 +1361,7 @@ Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentif
         if ( pModuleIter != m_aModuleToWindowStateHashMap.end() )
         {
             if ( pModuleIter->second.is() )
-                a = makeAny( pModuleIter->second );
+                a <<= pModuleIter->second;
             else
             {
                 Reference< XNameAccess > xResourceURLWindowState;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index f156dfa7cceb..6257c12b521c 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -297,7 +297,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                     aPropValue.Value    <<= xToolbarWindow;
                     aArgs[3] <<= aPropValue;
                     aPropValue.Name     = "ItemId";
-                    aPropValue.Value    = makeAny( sal_Int32( nId ));
+                    aPropValue.Value    <<= sal_Int32( nId );
                     aArgs[4] <<= aPropValue;
 
                     try
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 6296fed95174..ced85e93f49f 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -254,7 +254,7 @@ void ComplexToolbarController::addNotifyInfo(
         uno::Sequence< beans::NamedValue > aInfoSeq( rInfo );
         aInfoSeq.realloc( nCount+1 );
         aInfoSeq[nCount].Name  = "Source";
-        aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() );
+        aInfoSeq[nCount].Value <<= getFrameInterface();
         pNotifyInfo->aInfoSeq  = aInfoSeq;
 
         Application::PostUserEvent( LINK(nullptr, ComplexToolbarController, Notify_Impl), pNotifyInfo );
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 51c6cc1e2067..0d2fa663aeb4 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -417,7 +417,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
 
             Sequence< PropertyValue > aArgsList( 1 );
             aArgsList[0].Name = "Referer";
-            aArgsList[0].Value = makeAny( OUString( "private:user" ));
+            aArgsList[0].Value <<= OUString( "private:user" );
 
             dispatchCommand( aURL, aArgsList, aTargetFrame );
         }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index a4bf6e447b2b..9105f945e89c 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -244,11 +244,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
     {
         Sequence< PropertyValue > aArgsList(3);
         aArgsList[0].Name = "Referer";
-        aArgsList[0].Value = makeAny( OUString( "private:user" ) );
+        aArgsList[0].Value <<= OUString( "private:user" );
 
         // documents in the picklist will never be opened as templates
         aArgsList[1].Name = "AsTemplate";
-        aArgsList[1].Value = makeAny( false );
+        aArgsList[1].Value <<= false;
 
         // Type detection needs to know which app we are opening it from.
         aArgsList[2].Name = "DocumentService";
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 53fc6dd2e9f7..efbe34c91f9d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -319,7 +319,7 @@ void StatusBarManager::CreateControllers()
 
         // TODO remove this
         aPropValue.Name     = "ServiceManager";
-        aPropValue.Value    = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) );
+        aPropValue.Value    <<= uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
         aPropVector.push_back( uno::makeAny( aPropValue ) );
 
         aPropValue.Name     = "ParentWindow";
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 518ef1a1d9ba..d72a16518055 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -720,7 +720,7 @@ void ToolBarManager::CreateControllers()
             aPropValue.Value    <<= xToolbarWindow;
             aPropertyVector.push_back( makeAny( aPropValue ));
             aPropValue.Name     = "Identifier";
-            aPropValue.Value    = uno::makeAny( nId );
+            aPropValue.Value    <<= nId;
             aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
             Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -826,7 +826,7 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Value <<= m_aModuleIdentifier;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name     = "Identifier";
-                aPropValue.Value    = uno::makeAny( nId );
+                aPropValue.Value    <<= nId;
                 aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
                 Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -1703,7 +1703,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
                                     {
                                         // We have found the requested item, toggle the visible flag
                                         // and write back the configuration settings to the toolbar
-                                        aProp[nVisibleIndex].Value = makeAny( !bVisible );
+                                        aProp[nVisibleIndex].Value <<= !bVisible;
                                         try
                                         {
                                             xItemContainer->replaceByIndex( i, makeAny( aProp ));
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 007f6c4a7a65..6542f9dcfa74 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -166,17 +166,17 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
 
             aSeqSeq.realloc( aSeqSeq.getLength() + 1 );
             aSeq[0].Name  = m_aPropType;
-            aSeq[0].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+            aSeq[0].Value <<= aFactory.getToken( 0, '^', nToken );
             if ( nToken > 0 )
             {
                 aSeq.realloc( 2 );
                 aSeq[1].Name  = m_aPropName;
-                aSeq[1].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+                aSeq[1].Value <<= aFactory.getToken( 0, '^', nToken );
                 if ( nToken > 0 )
                 {
                     aSeq.realloc( 3 );
                     aSeq[2].Name  = m_aPropModule;
-                    aSeq[2].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+                    aSeq[2].Value <<= aFactory.getToken( 0, '^', nToken );
                 }
             }