makeAny->Any in basctl..chart2

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

147 files changed, 722 insertions, 727 deletions

diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 36c5b95b815e..53ff103998df 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -305,7 +305,7 @@ void LibBox::NotifyIDE()
     if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos)))
     {
         ScriptDocument aDocument( pEntry->GetDocument() );
-        SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::makeAny( aDocument.getDocumentOrNull() ) );
+        SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::Any( aDocument.getDocumentOrNull() ) );
         OUString aLibName = pEntry->GetLibName();
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 3af2ee9ef9f9..495176265bcb 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -134,7 +134,7 @@ Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
         aSize.Width  = aPageSize.Width();
         aSize.Height = aPageSize.Height();
         aVals = ::comphelper::InitPropertySequence({
-            { "PageSize", makeAny(aSize) }
+            { "PageSize", Any(aSize) }
         });
     }
 
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 2d6587300d7a..821c34176072 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1280,7 +1280,7 @@ void DialogWindow::StoreData()
                     Reference< XComponentContext > xContext(
                         comphelper::getProcessComponentContext() );
                     Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
-                    xLib->replaceByName( GetName(), makeAny( xISP ) );
+                    xLib->replaceByName( GetName(), Any( xISP ) );
                 }
             }
         }
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1fe82da30dbe..43d40784ee21 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -239,7 +239,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
                         }
 
                         if ( xStatusIndicator.is() )
-                            rReq.AppendItem( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::makeAny( xStatusIndicator ) ) );
+                            rReq.AppendItem( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::Any( xStatusIndicator ) ) );
                     }
 
                     aDocument.saveDocument( xStatusIndicator );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0a2f4214d047..200d845f8fbd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -619,7 +619,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
         SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
         SfxGetpApp()->ExecuteSlot( aRequest );
 
-        SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
+        SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( m_aCurDocument.getDocumentOrNull() ) );
         SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
         DBG_ASSERT( pCurEntry, "Entry?!" );
         OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
@@ -1258,8 +1258,8 @@ void LibPage::ExportAsPackage( const OUString& aLibName )
         OUString fullPath = aLibName
                           + "/" ;
         auto attribs(::comphelper::InitPropertySequence({
-            { strFullPath, makeAny(fullPath) },
-            { strMediaType, makeAny(strBasicMediaType) }
+            { strFullPath, Any(fullPath) },
+            { strMediaType, Any(strBasicMediaType) }
         }));
         manifest.push_back( attribs );
 
@@ -1334,7 +1334,7 @@ void LibPage::DeleteCurrent()
     if ( QueryDelLib( aLibName, bIsLibraryLink, this ) )
     {
         // inform BasicIDE
-        SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
+        SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( m_aCurDocument.getDocumentOrNull() ) );
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->ExecuteList(SID_BASICIDE_LIBREMOVED,
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fa53485954a8..c76e716ae4da 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -715,7 +715,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
                 if (pDocumentEntry)
                     aDocument = pDocumentEntry->GetDocument();
             }
-            SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( aDocument.getDocumentOrNull() ) );
+            SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( aDocument.getDocumentOrNull() ) );
             OUString aLibName( m_pBasicBox->GetEntryText( pCurEntry ) );
             SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
             if ( pDispatcher )
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 135ea2b9659b..c5966a49f1da 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -75,7 +75,7 @@ namespace basctl
     using ::com::sun::star::container::NoSuchElementException;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::task::XStatusIndicator;
-    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Any;
     using ::com::sun::star::script::XLibraryContainer2;
     using ::com::sun::star::uri::UriReferenceFactory;
     using ::com::sun::star::uri::XUriReferenceFactory;
@@ -628,7 +628,7 @@ namespace basctl
 
                 // set new name as property
                 Reference< XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY_THROW );
-                xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
+                xDlgPSet->setPropertyValue( DLGED_PROP_NAME, Any( _rNewName ) );
 
                 // export dialog model
                 xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
@@ -680,7 +680,7 @@ namespace basctl
             }
 
             // insert module into library
-            xLib->insertByName( _rModName, makeAny( _out_rNewModuleCode ) );
+            xLib->insertByName( _rModName, Any( _out_rNewModuleCode ) );
         }
         catch( const Exception& )
         {
@@ -718,7 +718,7 @@ namespace basctl
             Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW );
             if ( !xLib->hasByName( _rModName ) )
                 return false;
-            xLib->replaceByName( _rModName, makeAny( _rModuleCode ) );
+            xLib->replaceByName( _rModName, Any( _rModuleCode ) );
             return true;
         }
         catch( const Exception& )
@@ -750,13 +750,13 @@ namespace basctl
 
             // set name property
             Reference< XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY_THROW );
-            xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
+            xDlgPSet->setPropertyValue( DLGED_PROP_NAME, Any( _rDialogName ) );
 
             // export dialog model
             _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
 
             // insert dialog into library
-            xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
+            xLib->insertByName( _rDialogName, Any( _out_rDialogProvider ) );
         }
         catch( const Exception& )
         {
@@ -813,7 +813,7 @@ namespace basctl
         if ( _rxStatusIndicator.is() )
         {
             aArgs = ::comphelper::InitPropertySequence({
-                { "StatusIndicator", makeAny(_rxStatusIndicator) }
+                { "StatusIndicator", Any(_rxStatusIndicator) }
             });
         }
 
@@ -1376,7 +1376,7 @@ namespace basctl
 
     bool ScriptDocument::insertModule( const OUString& _rLibName, const OUString& _rModName, const OUString& _rModuleCode ) const
     {
-        return m_pImpl->insertModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, makeAny( _rModuleCode ) );
+        return m_pImpl->insertModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, Any( _rModuleCode ) );
     }
 
 
@@ -1426,7 +1426,7 @@ namespace basctl
 
     bool ScriptDocument::insertDialog( const OUString& _rLibName, const OUString& _rDialogName, const Reference< XInputStreamProvider >& _rxDialogProvider ) const
     {
-        return m_pImpl->insertModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName, makeAny( _rxDialogProvider ) );
+        return m_pImpl->insertModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName, Any( _rxDialogProvider ) );
     }
 
 
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 052506d61ef4..ecdbdf540ad1 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -122,8 +122,8 @@ void DlgEditor::ShowDialog()
             aDecorationAny >>= bDecoration;
             if( !bDecoration )
             {
-                xNewDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
-                xNewDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) );
+                xNewDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
+                xNewDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
             }
         }
         catch(const UnknownPropertyException& )
@@ -792,7 +792,7 @@ void DlgEditor::Copy()
             memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen );
             memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen );
 
-            aSeqData[1] = Any(aCombinedData);
+            aSeqData[1] <<= aCombinedData;
 
             pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavorsResource, aSeqData );
         }
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 7b839c3fcb34..a2ac76553099 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1133,7 +1133,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const  css::beans::PropertyChangeEvent&
                 catch (container::NoSuchElementException const& e)
                 {
                     throw lang::WrappedTargetRuntimeException("", nullptr,
-                            uno::makeAny(e));
+                            uno::Any(e));
                 }
             }
         }
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index fea4b0591b1d..c4b5d3d34756 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -122,8 +122,8 @@ void PropBrw::ImplReCreateController()
         // a ComponentContext for the
         ::cppu::ContextEntry_Init aHandlerContextInfo[] =
         {
-            ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( VCLUnoHelper::GetInterface ( this ) ) ),
-            ::cppu::ContextEntry_Init( "ContextDocument", makeAny( m_xContextDocument ) )
+            ::cppu::ContextEntry_Init( "DialogParentWindow", Any( VCLUnoHelper::GetInterface ( this ) ) ),
+            ::cppu::ContextEntry_Init( "ContextDocument", Any( m_xContextDocument ) )
         };
         Reference< XComponentContext > xInspectorContext(
             ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
@@ -296,7 +296,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     if ( m_xBrowserController.is() )
     {
         m_xBrowserController->setPropertyValue( "IntrospectedObject",
-            makeAny( _rxObject )
+            Any( _rxObject )
         );
 
         // set the new title according to the selected object
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index a0f3f3208cd1..e493c20a89b1 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -142,8 +142,8 @@ void VBATest::testMiscOLEStuff()
     OUString sPath = m_directories.getPathFromSrc("/basic/qa/vba_tests/data/ADODBdata.xls");
     sPath = sPath.replaceAll( "/", "\\" );
 
-    aArgs[ 0 ] = uno::makeAny( sPath );
-    aArgs[ 1 ] = uno::makeAny( OUString(pODBCDriverName) );
+    aArgs[ 0 ] <<= sPath;
+    aArgs[ 1 ] <<= OUString(pODBCDriverName);
 
     for ( sal_uInt32  i=0; i<SAL_N_ELEMENTS( macroSource ); ++i )
     {
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 03d730985b2c..f7bff18bfc2f 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -309,7 +309,7 @@ namespace basic
 
         // StarDesktop
         Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
-        pBasicManager->SetGlobalUNOConstant( "StarDesktop", makeAny( Desktop::create(xContext)));
+        pBasicManager->SetGlobalUNOConstant( "StarDesktop", css::uno::Any( Desktop::create(xContext)));
 
         // (BasicLibraries and DialogLibraries have automatically been added in SetLibraryContainerInfo)
 
@@ -474,7 +474,7 @@ namespace basic
         _out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
 
         // global properties in the document's Basic
-        _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+        _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", css::uno::Any( _rxDocumentModel ) );
 
         // notify
         impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index de6381071a73..9b0c92a850fc 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -608,8 +608,8 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
         }
     }
 
-    SetGlobalUNOConstant( "BasicLibraries", makeAny( mpImpl->maContainerInfo.mxScriptCont ) );
-    SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
+    SetGlobalUNOConstant( "BasicLibraries", uno::Any( mpImpl->maContainerInfo.mxScriptCont ) );
+    SetGlobalUNOConstant( "DialogLibraries", uno::Any( mpImpl->maContainerInfo.mxDialogCont ) );
 }
 
 BasicManager::BasicManager( StarBASIC* pSLib, OUString* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index baad83868410..d6fb2cca2866 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -78,7 +78,7 @@ ErrObject::setNumber( ::sal_Int32 _number )
 {
     GetSbData()->pInst->setErrorVB( _number, OUString() );
     OUString _description = GetSbData()->pInst->GetErrorMsg();
-    setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+    setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
 }
 
 ::sal_Int32 SAL_CALL
@@ -192,7 +192,7 @@ SbxErrObject::getUnoErrObject()
 SbxVariableRef const &
 SbxErrObject::getErrObject()
 {
-    static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
+    static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::Any( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
     return pGlobErr;
 }
 
@@ -200,7 +200,7 @@ void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString&
 {
     if( m_pErrObject != nullptr )
     {
-        m_pErrObject->setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+        m_pErrObject->setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
     }
 }
 
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 49a0163d26bf..05df7986ddfe 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -471,8 +471,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
             aDecorationAny >>= bDecoration;
             if( !bDecoration )
             {
-                xDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
-                xDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) );
+                xDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
+                xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
             }
         }
         catch(const UnknownPropertyException& )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index fa5019e05e0a..60d71c79a445 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -454,7 +454,7 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass )
             Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), UNO_SET_THROW );
             OUString aServiceName("ooo.vba.FileSystemObject");
             Reference< XInterface > xInterface( xFactory->createInstance( aServiceName ), UNO_SET_THROW );
-            return new SbUnoObject( aServiceName, uno::makeAny( xInterface ) );
+            return new SbUnoObject( aServiceName, uno::Any( xInterface ) );
         }
         catch(const Exception& )
         {
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f964ef2dd32d..c9c7b739e8ce 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2165,7 +2165,7 @@ SbObjModule::SbObjModule( const OUString& rName, const css::script::ModuleInfo&
     }
     else if ( mInfo.ModuleObject.is() )
     {
-        SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
+        SetUnoObject( uno::Any( mInfo.ModuleObject ) );
     }
 }
 
@@ -2654,7 +2654,7 @@ void SbUserFormModule::InitObject()
             aArgs[ 1 ] <<= m_xDialog;
             aArgs[ 2 ] <<= m_xModel;
             aArgs[ 3 ] <<= OUString( GetParent()->GetName() );
-            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs  ) ) );
+            pDocObject = new SbUnoObject( GetName(), uno::Any( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs  ) ) );
 
             uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
 
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index eee8de4a90aa..f24e4268293f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2694,10 +2694,10 @@ RTLFUNC(SYD)
     // retrieve non-optional params
 
     Sequence< Any > aParams( 4 );
-    aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
-    aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
-    aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
-    aParams[ 3 ] = makeAny( rPar.Get(4)->GetDouble() );
+    aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+    aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+    aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
+    aParams[ 3 ] <<= rPar.Get(4)->GetDouble();
 
     CallFunctionAccessFunction( aParams, "SYD", rPar.Get( 0 ) );
 }
@@ -2718,9 +2718,9 @@ RTLFUNC(SLN)
     // retrieve non-optional params
 
     Sequence< Any > aParams( 3 );
-    aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
-    aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
-    aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+    aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+    aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+    aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
 
     CallFunctionAccessFunction( aParams, "SLN", rPar.Get( 0 ) );
 }
@@ -2876,7 +2876,7 @@ RTLFUNC(NPV)
     }
 
     Sequence< Any > aParams( 2 );
-    aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
+    aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
     Any aValues = sbxToUnoValue( rPar.Get(2),
                 cppu::UnoType<Sequence<double>>::get() );
 
@@ -2960,8 +2960,8 @@ RTLFUNC(MIRR)
     aValues <<= sValues;
 
     aParams[ 0 ] = aValues;
-    aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
-    aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+    aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+    aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
 
     CallFunctionAccessFunction( aParams, "MIRR", rPar.Get( 0 ) );
 }
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ae579545f74b..189eb642530c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -530,7 +530,7 @@ void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModif
 Any SAL_CALL SfxLibraryContainer::getRootLocation()
 {
     LibraryContainerMethodGuard aGuard( *this );
-    return makeAny( getRootStorage() );
+    return Any( getRootStorage() );
 }
 
 OUString SAL_CALL SfxLibraryContainer::getContainerLocationName()
@@ -1426,10 +1426,10 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
 
                 if ( xProps.is() )
                 {
-                    xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+                    xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
 
                     // #87671 Allow encryption
-                    xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+                    xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
 
                     Reference< XOutputStream > xOutput = xElementStream->getOutputStream();
                     Reference< XNameContainer > xLib( pLib );
@@ -1565,10 +1565,10 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
             if ( xProps.is() )
             {
                 OUString aMime("text/xml");
-                xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+                xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
 
                 // #87671 Allow encryption
-                xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+                xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
 
                 xOut = xInfoStream->getOutputStream();
             }
@@ -2087,10 +2087,10 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
                 throw uno::RuntimeException();
             }
             OUString aMime( "text/xml" );
-            xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+            xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
 
             // #87671 Allow encryption
-            xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+            xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
 
             xOut = xInfoStream->getOutputStream();
         }
@@ -3075,7 +3075,7 @@ void SfxLibrary::impl_checkLoaded()
         throw WrappedTargetException(
             OUString(),
             *this,
-            makeAny( LibraryNotLoadedException(
+            Any( LibraryNotLoadedException(
                 OUString(),
                 *this
             ) )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 07f8935595e5..d78242de70fc 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -673,7 +673,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
                         throw uno::RuntimeException();
                     }
                     OUString aMime( "text/xml" );
-                    xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+                    xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
 
                     // Set encryption key
                     setStreamKey( xSourceStream, pLib->maPassword );
@@ -818,7 +818,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
                         throw uno::RuntimeException();
                     }
                     OUString aMime( "text/xml" );
-                    xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+                    xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
 
                     Reference< XOutputStream > xOut = xSourceStream->getOutputStream();
                     Reference< XNameContainer > xLib( pLib );
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index a47fbaa9a3cb..1a05bc26430f 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -779,7 +779,7 @@ void Bridge::handleCommitChangeRequest(
             bCcMode = false;
             bExc = true;
             ret = mapCppToBinaryAny(
-                css::uno::makeAny(
+                css::uno::Any(
                     css::bridge::InvalidProtocolChangeException(
                         "InvalidProtocolChangeException",
                         css::uno::Reference< css::uno::XInterface >(), s[i],
@@ -941,7 +941,7 @@ void Bridge::sendCommitChangeRequest() {
     css::uno::Sequence< css::bridge::ProtocolProperty > s(1);
     s[0].Name = "CurrentContext";
     std::vector< BinaryAny > a;
-    a.push_back(mapCppToBinaryAny(css::uno::makeAny(s)));
+    a.push_back(mapCppToBinaryAny(css::uno::Any(s)));
     sendProtPropRequest(OutgoingRequest::KIND_COMMIT_CHANGE, a);
 }
 
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index aaa46cb4fa79..17ab82d1c718 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -122,7 +122,7 @@ std::shared_ptr<utl::TempFile> ChartTest::save(const OUString& rFilterName)
 {
     uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
     auto aArgs(::comphelper::InitPropertySequence({
-        { "FilterName", makeAny(rFilterName) }
+        { "FilterName", Any(rFilterName) }
     }));
     std::shared_ptr<utl::TempFile> pTempFile = std::make_shared<utl::TempFile>();
     pTempFile->EnableKillingFile();
diff --git a/chart2/qa/unit/common_functor_test.cxx b/chart2/qa/unit/common_functor_test.cxx
index ecc4f487cf4a..c630455b4ad8 100644
--- a/chart2/qa/unit/common_functor_test.cxx
+++ b/chart2/qa/unit/common_functor_test.cxx
@@ -38,13 +38,13 @@ private:
 void CommonFunctorsTest::testAnyToString()
 {
     std::vector<css::uno::Any> aInput;
-    aInput.push_back(css::uno::makeAny(2.0));
-    aInput.push_back(css::uno::makeAny(10.0));
-    aInput.push_back(css::uno::makeAny(12.0));
-    aInput.push_back(css::uno::makeAny(15.0));
-    aInput.push_back(css::uno::makeAny(25.234));
-    aInput.push_back(css::uno::makeAny(123.456));
-    aInput.push_back(css::uno::makeAny(0.123450));
+    aInput.push_back(css::uno::Any(2.0));
+    aInput.push_back(css::uno::Any(10.0));
+    aInput.push_back(css::uno::Any(12.0));
+    aInput.push_back(css::uno::Any(15.0));
+    aInput.push_back(css::uno::Any(25.234));
+    aInput.push_back(css::uno::Any(123.456));
+    aInput.push_back(css::uno::Any(0.123450));
 
     std::vector<OUString> aOutput;
     std::transform(aInput.begin(), aInput.end(),
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index a7b088083ff8..c5a993e4e470 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -585,7 +585,7 @@ void AxisWrapper::updateReferenceSize()
     if( xProp.is() )
     {
         if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
-            xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
+            xProp->setPropertyValue("ReferencePageSize", uno::Any(
             m_spChart2ModelContact->GetPageSize() ));
     }
 }
@@ -618,7 +618,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
             xAxis = AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, m_spChart2ModelContact->m_xContext );
             Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue("Show", uno::makeAny( false ) );
+                xProp->setPropertyValue("Show", uno::Any( false ) );
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index f98a743814c4..2a912ff51b77 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -479,7 +479,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
             Any aAOld = xLegendProp->getPropertyValue("Show");
             aAOld >>= bOldValue;
             if( bOldValue != bNewValue )
-                xLegendProp->setPropertyValue("Show", uno::makeAny( bNewValue ));
+                xLegendProp->setPropertyValue("Show", uno::Any( bNewValue ));
         }
     }
     catch (const uno::Exception& ex)
@@ -1277,10 +1277,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                         m_xChartView = xViewInit;
 
                         Sequence< Any > aArguments(2);
-                        Reference<frame::XModel> xModel(this);
-                        aArguments[0]=uno::makeAny(xModel);
-                        bool bRefreshAddIn = true;
-                        aArguments[1]=uno::makeAny(bRefreshAddIn);
+                        aArguments[0] <<= Reference<frame::XModel>(this);
+                        aArguments[1] <<= true; // bRefreshAddIn
                         xViewInit->initialize(aArguments);
                     }
                     catch (const uno::Exception& ex)
@@ -1446,8 +1444,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
     aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) );
     aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) );
     aWrappedProperties.push_back( new WrappedIgnoreProperty("NullDate",Any() ) ); // i99104
-    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::makeAny(true) ) );
-    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::makeAny(true) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::Any(true) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::Any(true) ) );
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index f83bc35c5cc8..a3769336501a 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -374,7 +374,7 @@ WrappedLineColorProperty::WrappedLineColorProperty(
                 DataSeriesPointWrapper* pDataSeriesPointWrapper )
                 : WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper )
                 , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
-                , m_aDefaultValue(uno::makeAny(sal_Int32( 0x0099ccff )))  // blue 8
+                , m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff )))  // blue 8
                 , m_aOuterValue(m_aDefaultValue)
 {
 }
@@ -422,7 +422,7 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
                 DataSeriesPointWrapper* pDataSeriesPointWrapper )
                 : WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
                 , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
-                , m_aDefaultValue(uno::makeAny(drawing::LineStyle_SOLID))
+                , m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID))
                 , m_aOuterValue(m_aDefaultValue)
 {
 }
@@ -433,7 +433,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
     if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
     {
         m_aOuterValue = rOuterValue;
-        aNewValue = uno::makeAny(drawing::LineStyle_NONE);
+        aNewValue = uno::Any(drawing::LineStyle_NONE);
     }
     WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet );
 }
@@ -581,7 +581,7 @@ void DataSeriesPointWrapper::updateReferenceSize()
     if( xProp.is() )
     {
         if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
-            xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
+            xProp->setPropertyValue("ReferencePageSize", uno::Any(
                 m_spChart2ModelContact->GetPageSize() ));
     }
 }
@@ -747,7 +747,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
     aWrappedProperties.push_back( new WrappedProperty("FillStyle","FillStyle" ) );
     aWrappedProperties.push_back( new WrappedProperty("FillTransparence","Transparency") );
 
-    aWrappedProperties.push_back( new WrappedIgnoreProperty("LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) );
     aWrappedProperties.push_back( new WrappedProperty("FillTransparenceGradientName","TransparencyGradientName") );
     aWrappedProperties.push_back( new WrappedProperty("FillGradientName","GradientName") );
     aWrappedProperties.push_back( new WrappedProperty("FillGradientStepCount","GradientStepCount") );
@@ -854,7 +854,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
                     {
                         Reference< chart2::XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme() );
                         if( xColorScheme.is() )
-                            return uno::makeAny( xColorScheme->getColorByIndex( m_nPointIndex ) );
+                            return uno::Any( xColorScheme->getColorByIndex( m_nPointIndex ) );
                     }
                 }
             }
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index ffb4fd92f2ff..74952ee851e2 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -746,8 +746,8 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
             xProp->setPropertyValue( "RelativePosition", aEmpty );
             return;
         }
-        xProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
-        xProp->setPropertyValue( "PosSizeExcludeAxes", uno::makeAny(false) );
+        xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
+        xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) );
     }
 }
 
@@ -777,8 +777,8 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
             return;
         }
 
-        xProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) );
-        xProp->setPropertyValue( "PosSizeExcludeAxes", uno::makeAny(false) );
+        xProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) );
+        xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) );
     }
 }
 
@@ -818,7 +818,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan
     DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
     uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
     if( xDiaProps.is() )
-        xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) );
+        xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(true) );
 }
 sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning()
 {
@@ -846,7 +846,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan
     DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
     uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
     if( xDiaProps.is() )
-        xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) );
+        xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(false) );
 }
 awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes(  )
 {
@@ -1525,7 +1525,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
         }
     }
     if(bHasDetectableInnerValue)
-        rInnerValue = uno::makeAny(nNumberOfLines);
+        rInnerValue = uno::Any(nNumberOfLines);
     return bHasDetectableInnerValue;
 }
 
@@ -1584,7 +1584,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
                 // locked controllers
                 ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
                 uno::Reference< beans::XPropertySet > xProp( xTemplate, uno::UNO_QUERY );
-                xProp->setPropertyValue( "NumberOfLines", uno::makeAny(nNewValue) );
+                xProp->setPropertyValue( "NumberOfLines", uno::Any(nNewValue) );
                 xTemplate->changeDiagram( xDiagram );
             }
             catch( const uno::Exception & ex )
@@ -1773,7 +1773,7 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert
 
 Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
 {
-    return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID );
+    return uno::Any( css::chart::ChartSolidType::RECTANGULAR_SOLID );
 }
 
 class WrappedAutomaticSizeProperty : public WrappedProperty
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index fb2fb8d7e8e2..e95a0c8f3147 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -161,7 +161,7 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
-    aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::makeAny( sal_Int32( 0x000000) ) ) ); // black
+    aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::Any( sal_Int32( 0x000000) ) ) ); // black
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index caa5bf8e1eaa..4d699c453584 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -79,7 +79,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
         xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend;
         if(!bShowLegend)
         {
-            aRet = uno::makeAny( css::chart::ChartLegendPosition_NONE );
+            aRet = uno::Any( css::chart::ChartLegendPosition_NONE );
         }
         else
         {
@@ -104,7 +104,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
         }
         if(bNewShowLegend!=bOldShowLegend)
         {
-            xInnerPropertySet->setPropertyValue( "Show", uno::makeAny(bNewShowLegend) );
+            xInnerPropertySet->setPropertyValue( "Show", uno::Any(bNewShowLegend) );
         }
         if(!bNewShowLegend)
             return;
@@ -128,7 +128,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
                 xInnerPropertySet->getPropertyValue( "Expansion" ) >>= eOldExpansion );
 
             if( !bExpansionWasSet || (eOldExpansion != eNewExpansion))
-                xInnerPropertySet->setPropertyValue( "Expansion", uno::makeAny( eNewExpansion ));
+                xInnerPropertySet->setPropertyValue( "Expansion", uno::Any( eNewExpansion ));
         }
 
         //correct RelativePosition
@@ -167,7 +167,7 @@ Any WrappedLegendAlignmentProperty::convertInnerToOuterValue( const Any& rInnerV
                 break;
         }
     }
-    return uno::makeAny( ePos );
+    return uno::Any( ePos );
 }
 Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
 {
@@ -195,7 +195,7 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV
         }
     }
 
-    return uno::makeAny( eNewPos );
+    return uno::Any( eNewPos );
 }
 }
 
@@ -291,7 +291,7 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
         aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
         aRelativePosition.Primary = aPageSize.Width == 0 ? 0 : double(aPosition.X)/double(aPageSize.Width);
         aRelativePosition.Secondary = aPageSize.Height == 0 ? 0 : double(aPosition.Y)/double(aPageSize.Height);
-        xProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
     }
 }
 
@@ -351,7 +351,7 @@ void LegendWrapper::updateReferenceSize()
     if( xProp.is() )
     {
         if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
-            xProp->setPropertyValue( "ReferencePageSize", uno::makeAny(
+            xProp->setPropertyValue( "ReferencePageSize", uno::Any(
                 m_spChart2ModelContact->GetPageSize() ));
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 282fcdf5469a..4b9a84d24ce2 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -120,7 +120,7 @@ namespace wrapper
 MinMaxLineWrapper::MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
         : m_spChart2ModelContact( spChart2ModelContact )
         , m_aEventListenerContainer( m_aMutex )
-        , m_aWrappedLineJointProperty( "LineJoint", uno::makeAny( drawing::LineJoint_NONE ))
+        , m_aWrappedLineJointProperty( "LineJoint", uno::Any( drawing::LineJoint_NONE ))
 {
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 3cbef7fb707d..e56f203765a1 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -94,7 +94,7 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope
 }
 Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
 {
-    return uno::makeAny( OUString() );//default title is a empty String
+    return uno::Any( OUString() );//default title is a empty String
 }
 
 class WrappedStackedTextProperty : public WrappedProperty
@@ -214,7 +214,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
         aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
         aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width);
         aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height);
-        xPropertySet->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xPropertySet->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
     }
 }
 
@@ -430,7 +430,7 @@ void TitleWrapper::updateReferenceSize()
     if( xProp.is() )
     {
         if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
-            xProp->setPropertyValue( "ReferencePageSize", uno::makeAny(
+            xProp->setPropertyValue( "ReferencePageSize", uno::Any(
                             m_spChart2ModelContact->GetPageSize() ));
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index ffd6baa83711..b55662a899d1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -49,7 +49,7 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer
 
 Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
 {
-    return uno::makeAny( m_rChartDocumentWrapper.getAddIn() );
+    return uno::Any( m_rChartDocumentWrapper.getAddIn() );
 }
 
 WrappedBaseDiagramProperty::WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -72,7 +72,7 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const
 
 Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
 {
-    return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() );
+    return uno::Any( m_rChartDocumentWrapper.getBaseDiagram() );
 }
 
 WrappedAdditionalShapesProperty::WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -91,7 +91,7 @@ void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue
 
 Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
 {
-    return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() );
+    return uno::Any( m_rChartDocumentWrapper.getAdditionalShapes() );
 }
 
 WrappedRefreshAddInAllowedProperty::WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -114,7 +114,7 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu
 
 Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
 {
-    return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() );
+    return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() );
 }
 
 } //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index bd80bbd16009..8654699304fe 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -360,7 +360,7 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue
         //create axis if needed
         xProp.set( AxisHelper::createAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ), uno::UNO_QUERY );
         if( xProp.is() )
-            xProp->setPropertyValue( "Show", uno::makeAny( false ) );
+            xProp->setPropertyValue( "Show", uno::Any( false ) );
     }
     if( xProp.is() )
         xProp->setPropertyValue( "DisplayLabels", rOuterValue );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index ad19a61f76af..f49014b1f25d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -124,7 +124,7 @@ WrappedDataCaptionProperty::WrappedDataCaptionProperty(
       const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact
     , tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< sal_Int32 >( "DataCaption"
-            , uno::makeAny( sal_Int32(0) ), spChart2ModelContact, ePropertyType )
+            , uno::Any( sal_Int32(0) ), spChart2ModelContact, ePropertyType )
 {
 }
 
@@ -144,7 +144,7 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
         return;
 
     chart2::DataPointLabel aLabel = lcl_CaptionToLabel( nCaption );
-    xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::makeAny( aLabel ) );
+    xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) );
 }
 
 } //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 93bbda452c22..c4ca7e73931f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -130,7 +130,7 @@ void WrappedGL3DProperties::addWrappedProperties(
 {
     rList.push_back(
         new WrappedGL3DProperty(
-            CHART_UNONAME_ROUNDED_EDGE, CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(false), pChart2ModelContact));
+            CHART_UNONAME_ROUNDED_EDGE, CHART_UNONAME_ROUNDED_EDGE, uno::Any(false), pChart2ModelContact));
 }
 
 }}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 57fa2a3aa3c2..3f016f5b1299 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -39,7 +39,7 @@ WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base(
                 , const OUString& rInnerSequencePropertyName
                 , sal_Int32 nDefaultValue
                 , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact )
-            : WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) )
+            : WrappedDefaultProperty( rOuterName, OUString(), uno::Any( nDefaultValue ) )
             , m_nDimensionIndex(0)
             , m_nAxisIndex(0)
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -94,7 +94,7 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue,
                     }
                     aBarPositionSequence[m_nAxisIndex] = nNewValue;
 
-                    xProp->setPropertyValue( m_InnerSequencePropertyName, uno::makeAny( aBarPositionSequence ) );
+                    xProp->setPropertyValue( m_InnerSequencePropertyName, uno::Any( aBarPositionSequence ) );
                 }
             }
             catch( uno::Exception& e )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 0b41f8900c9a..2c34d58db293 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -77,7 +77,7 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
 
 Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
 {
-    return uno::makeAny( sal_Int32( 0 ) );
+    return uno::Any( sal_Int32( 0 ) );
 }
 
 WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty() :
@@ -113,8 +113,7 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X
 
 Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
 {
-    bool bLink = true;
-    return uno::makeAny( bLink );
+    return uno::Any( true ); // bLink
 }
 
 } //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index bd042609183e..63f8860f1f72 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -404,7 +404,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                 {
                     sal_Int32 nIntervalCount = 0;
                     rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount;
-                    aRet = uno::makeAny( double(nIntervalCount) );
+                    aRet = uno::Any( double(nIntervalCount) );
                     bNeedToCalculateExplicitValues = false;
                 }
             }
@@ -442,7 +442,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                         if( rSubIncrements.getLength() > 0 )
                         {
                             sal_Int32 nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
-                            aRet = uno::makeAny( double(nIntervalCount) );
+                            aRet = uno::Any( double(nIntervalCount) );
                         }
                     }
                     else
@@ -476,7 +476,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                 if( !aExplicitIncrement.SubIncrements.empty() )
                     nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
             }
-            aRet = uno::makeAny( nIntervalCount );
+            aRet = uno::Any( nIntervalCount );
             break;
         }
         case SCALE_PROP_AUTO_MAX:
@@ -531,13 +531,13 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                 if( !aScaleData.AutoDateAxis )
                     nType = css::chart::ChartAxisType::CATEGORY;
             }
-            aRet = uno::makeAny( nType );
+            aRet = uno::Any( nType );
             break;
         }
         case SCALE_PROP_DATE_INCREMENT:
         {
             if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
-                aRet = uno::makeAny( aScaleData.TimeIncrement );
+                aRet = uno::Any( aScaleData.TimeIncrement );
             break;
         }
         case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
@@ -548,15 +548,15 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                 if( aExplicitScale.AxisType == AxisType::DATE )
                 {
                     TimeIncrement aTimeIncrement;
-                    aTimeIncrement.MajorTimeInterval = uno::makeAny( aExplicitIncrement.MajorTimeInterval );
-                    aTimeIncrement.MinorTimeInterval = uno::makeAny( aExplicitIncrement.MinorTimeInterval );
-                    aTimeIncrement.TimeResolution = uno::makeAny( aExplicitScale.TimeResolution );
-                    aRet = uno::makeAny(aTimeIncrement);
+                    aTimeIncrement.MajorTimeInterval = uno::Any( aExplicitIncrement.MajorTimeInterval );
+                    aTimeIncrement.MinorTimeInterval = uno::Any( aExplicitIncrement.MinorTimeInterval );
+                    aTimeIncrement.TimeResolution = uno::Any( aExplicitScale.TimeResolution );
+                    aRet = uno::Any(aTimeIncrement);
                 }
             }
 
             if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
-                aRet = uno::makeAny( aScaleData.TimeIncrement );
+                aRet = uno::Any( aScaleData.TimeIncrement );
             break;
         }
         case SCALE_PROP_LOGARITHMIC:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 5bdd1404089c..9f7cc28de789 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -70,7 +70,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
             if( bNewValue )
             {
                 awt::Size aRefSize( m_spChart2ModelContact->GetPageSize() );
-                xInnerPropertySet->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ) );
+                xInnerPropertySet->setPropertyValue( aRefSizeName, uno::Any( aRefSize ) );
             }
             else
                 xInnerPropertySet->setPropertyValue( aRefSizeName, Any() );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index 0de7f6d77378..f0d9e2a62561 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -66,7 +66,7 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue
 
             aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix);
 
-            WrappedProperty::setPropertyValue( uno::makeAny(aHM), xInnerPropertySet );
+            WrappedProperty::setPropertyValue( uno::Any(aHM), xInnerPropertySet );
             return;
         }
     }
@@ -92,7 +92,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans:
 
             aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix);
 
-            return uno::makeAny(aHM);
+            return uno::Any(aHM);
         }
     }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 9b1d869ee5e7..2537b9ade1ce 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -116,7 +116,7 @@ public:
                         css::uno::Reference< css::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], css::uno::UNO_QUERY );
                         if( xChartTypePropertySet.is() )
                         {
-                            xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::makeAny(aNewValue)));
+                            xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::Any(aNewValue)));
                         }
                     }
                     catch( uno::Exception & ex )
@@ -207,15 +207,15 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty
     rList.push_back(
         new WrappedSplineProperty<sal_Int32>(
             CHART_UNONAME_SPLINE_ORDER, CHART_UNONAME_SPLINE_ORDER,
-            uno::makeAny(sal_Int32(3)), spChart2ModelContact));
+            uno::Any(sal_Int32(3)), spChart2ModelContact));
     rList.push_back(
         new WrappedSplineProperty<sal_Int32>(
             CHART_UNONAME_SPLINE_RESOLUTION, CHART_UNONAME_CURVE_RESOLUTION,
-            uno::makeAny(sal_Int32(20)), spChart2ModelContact));
+            uno::Any(sal_Int32(20)), spChart2ModelContact));
 }
 
 WrappedSplineTypeProperty::WrappedSplineTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
-    : WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::makeAny(sal_Int32(0)), spChart2ModelContact )
+    : WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::Any(sal_Int32(0)), spChart2ModelContact )
 {
 }
 
@@ -249,7 +249,7 @@ Any WrappedSplineTypeProperty::convertInnerToOuterValue( const Any& rInnerValue
             nOuterValue = 0;
     }
 
-    return uno::makeAny(nOuterValue);
+    return uno::Any(nOuterValue);
 }
 Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
 {
@@ -283,7 +283,7 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue
             aInnerValue = chart2::CurveStyle_LINES;
     }
 
-    return uno::makeAny(aInnerValue);
+    return uno::Any(aInnerValue);
 }
 
 } //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 31e51a863943..012ee391e349 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -188,10 +188,10 @@ protected:
         {
             xErrorBarProperties = new ::chart::ErrorBar;
             //default in new and old api are different
-            xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) );
-            xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) );
-            xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(css::chart::ErrorBarStyle::NONE) );
-            xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::makeAny( xErrorBarProperties ) );
+            xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(false) );
+            xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(false) );
+            xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(css::chart::ErrorBarStyle::NONE) );
+            xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::Any( xErrorBarProperties ) );
         }
         return xErrorBarProperties;
     }
@@ -216,7 +216,7 @@ WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< double >( "ConstantErrorLow"
-            , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -240,7 +240,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        m_aOuterValue = uno::makeAny( aNewValue );
+        m_aOuterValue = uno::Any( aNewValue );
         if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
         {
             xErrorBarProperties->setPropertyValue( "NegativeError", m_aOuterValue );
@@ -266,7 +266,7 @@ WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< double >( "ConstantErrorHigh"
-            , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -290,7 +290,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        m_aOuterValue = uno::makeAny( aNewValue );
+        m_aOuterValue = uno::Any( aNewValue );
         if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
         {
             xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -312,7 +312,7 @@ public:
 WrappedMeanValueProperty::WrappedMeanValueProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
-        : WrappedStatisticProperty< bool >( "MeanValue", uno::makeAny( false ), spChart2ModelContact, ePropertyType  )
+        : WrappedStatisticProperty< bool >( "MeanValue", uno::Any( false ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -353,7 +353,7 @@ WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory"
-            , uno::makeAny( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -428,7 +428,7 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr
             default:
                 break;
         }
-        xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(nNewStyle) );
+        xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(nNewStyle) );
     }
 }
 
@@ -450,7 +450,7 @@ WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< double >( "PercentageError"
-            , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -473,7 +473,7 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        m_aOuterValue = uno::makeAny( aNewValue );
+        m_aOuterValue = uno::Any( aNewValue );
         if( css::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) )
         {
             xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -500,7 +500,7 @@ WrappedErrorMarginProperty::WrappedErrorMarginProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< double >( "ErrorMargin"
-            , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -523,7 +523,7 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        m_aOuterValue = uno::makeAny( aNewValue );
+        m_aOuterValue = uno::Any( aNewValue );
         if( css::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) )
         {
             xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -547,7 +547,7 @@ WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator"
-            , uno::makeAny( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -595,8 +595,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
                 break;
         }
 
-        xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(bPositive) );
-        xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(bNegative) );
+        xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(bPositive) );
+        xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(bNegative) );
     }
 }
 
@@ -616,7 +616,7 @@ WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle"
-            , uno::makeAny( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -639,7 +639,7 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nNewValue ));
+        xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any( nNewValue ));
     }
 }
 
@@ -661,7 +661,7 @@ WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< OUString >( "ErrorBarRangePositive"
-            , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( OUString() ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -724,7 +724,7 @@ WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative"
-            , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( OUString() ), spChart2ModelContact, ePropertyType  )
 {
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index c7f16fe0d61b..852fd0986d50 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -116,7 +116,7 @@ public:
 };
 
 WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
-        : WrappedStockProperty( "Volume", uno::makeAny(false) , spChart2ModelContact )
+        : WrappedStockProperty( "Volume", uno::Any(false) , spChart2ModelContact )
 {
 }
 
@@ -181,7 +181,7 @@ public:
 };
 
 WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
-        : WrappedStockProperty( "UpDown", uno::makeAny(false) , spChart2ModelContact )
+        : WrappedStockProperty( "UpDown", uno::Any(false) , spChart2ModelContact )
 {
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index ba107ea2e72b..830fbb692fd8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -209,7 +209,7 @@ WrappedSymbolTypeProperty::WrappedSymbolTypeProperty(
     const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType"
-            , uno::makeAny( css::chart::ChartSymbolType::NONE )
+            , uno::Any( css::chart::ChartSymbolType::NONE )
             , spChart2ModelContact
             , ePropertyType )
 {
@@ -234,7 +234,7 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope
     xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol;
 
     lcl_setSymbolTypeToSymbol( nSymbolType, aSymbol );
-    xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+    xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
 }
 
 Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
@@ -248,14 +248,14 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper
         {
             if(bHasAmbiguousValue)
             {
-                m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO );
+                m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
             }
             else
             {
                 if( css::chart::ChartSymbolType::NONE == aValue )
-                    m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::NONE );
+                    m_aOuterValue = uno::Any( css::chart::ChartSymbolType::NONE );
                 else
-                    m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO );
+                    m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
             }
         }
         return m_aOuterValue;
@@ -290,7 +290,7 @@ WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty(
     const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< OUString >( "SymbolBitmapURL"
-            , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( OUString() ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -326,7 +326,7 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
             GraphicObject aGrObj = GraphicObject(
                 OUStringToOString(aNewGraphicURL.copy( RTL_CONSTASCII_LENGTH(UNO_NAME_GRAPHOBJ_URLPREFIX) ), RTL_TEXTENCODING_ASCII_US));
             aSymbol.Graphic.set( aGrObj.GetGraphic().GetXGraphic());
-            xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+            xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
         }
         else
         {
@@ -336,11 +336,11 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
                 Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
                 Reference< graphic::XGraphicProvider > xGraphProv( graphic::GraphicProvider::create(xContext) );
                 Sequence< beans::PropertyValue > aArgs(1);
-                aArgs[0] = beans::PropertyValue( "URL", -1, uno::makeAny( aNewGraphicURL ),
+                aArgs[0] = beans::PropertyValue( "URL", -1, uno::Any( aNewGraphicURL ),
                     beans::PropertyState_DIRECT_VALUE );
                 aSymbol.Graphic.set( xGraphProv->queryGraphic( aArgs ));
                 OSL_ENSURE( aSymbol.Graphic.is(), "Invalid URL for Symbol Bitmap" );
-                xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+                xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
             }
             catch( const uno::Exception & ex )
             {
@@ -414,7 +414,7 @@ WrappedSymbolSizeProperty::WrappedSymbolSizeProperty(
     const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< awt::Size >( "SymbolSize"
-            , uno::makeAny( awt::Size(250,250) ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( awt::Size(250,250) ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -440,7 +440,7 @@ void WrappedSymbolSizeProperty::setValueToSeries(
     {
         aSymbol.Size = aNewSize;
         lcl_correctSymbolSizeForBitmaps(aSymbol);
-        xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+        xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
     }
 }
 
@@ -471,7 +471,7 @@ WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
     const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< bool >( "Lines"
-            , uno::makeAny( true ), spChart2ModelContact, ePropertyType  )
+            , uno::Any( true ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -494,12 +494,12 @@ void WrappedSymbolAndLinesProperty::setValueToSeries(
     {
         //#i114298# don't overwrite dashed lines with solid lines here
         if( eOldLineStyle == drawing::LineStyle_NONE )
-            xSeriesPropertySet->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+            xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
     }
     else
     {
         if( eOldLineStyle != drawing::LineStyle_NONE )
-            xSeriesPropertySet->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+            xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
     }
 }
 
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 1d434d4f86e6..6acfc912845f 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -288,9 +288,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
             {
                 try
                 {
-                    xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_STYLE , uno::makeAny(rParameter.eCurveStyle) );
-                    xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_RESOLUTION , uno::makeAny(rParameter.nCurveResolution) );
-                    xTemplateProps->setPropertyValue( CHART_UNONAME_SPLINE_ORDER , uno::makeAny(rParameter.nSplineOrder) );
+                    xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_STYLE , uno::Any(rParameter.eCurveStyle) );
+                    xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_RESOLUTION , uno::Any(rParameter.nCurveResolution) );
+                    xTemplateProps->setPropertyValue( CHART_UNONAME_SPLINE_ORDER , uno::Any(rParameter.nSplineOrder) );
                 }
                 catch( uno::Exception & ex )
                 {
@@ -299,7 +299,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
                 }
                 try
                 {
-                    xTemplateProps->setPropertyValue( "Geometry3D" , uno::makeAny(rParameter.nGeometry3D) );
+                    xTemplateProps->setPropertyValue( "Geometry3D" , uno::Any(rParameter.nGeometry3D) );
                 }
                 catch( uno::Exception & ex )
                 {
@@ -309,7 +309,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
 
                 try
                 {
-                    xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(rParameter.mbRoundedEdge));
+                    xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(rParameter.mbRoundedEdge));
                 }
                 catch ( const uno::Exception& )
                 {
@@ -354,7 +354,7 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
         uno::Reference<beans::XPropertySet> xDiaProp(xDiagram, uno::UNO_QUERY);
         if (xDiaProp.is())
         {
-            xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::makeAny(rParameter.bSortByXValues));
+            xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::Any(rParameter.bSortByXValues));
         }
     }
 }
@@ -1229,7 +1229,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
     if( xTemplateProps.is() )
     {
         sal_Int32 nNumLines = static_cast< sal_Int32 >( m_pMF_NumberOfLines->GetValue());
-        xTemplateProps->setPropertyValue( "NumberOfLines" , uno::makeAny(nNumLines) );
+        xTemplateProps->setPropertyValue( "NumberOfLines" , uno::Any(nNumLines) );
     }
 }
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 345ae0670b8f..b2ae9b21b90d 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1195,9 +1195,9 @@ bool DataBrowser::SaveModified()
             double fValue = 0.0;
             bChangeValid = false;
             if( isDateTimeString( aText, fValue ) )
-                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( fValue ) );
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::Any( fValue ) );
             if(!bChangeValid)
-                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( aText ) );
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::Any( aText ) );
         }
         break;
         case DataBrowserModel::TEXT:
@@ -1379,7 +1379,7 @@ IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, voi
                     Reference< container::XIndexReplace > xIndexReplace( xLabeledSeq->getLabel(), uno::UNO_QUERY );
                     if( xIndexReplace.is())
                         xIndexReplace->replaceByIndex(
-                            0, uno::makeAny( OUString( pEdit->GetText())));
+                            0, uno::Any( OUString( pEdit->GetText())));
                 }
             }
         }
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index e90d36a508bb..83064a1ee56f 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -390,7 +390,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
         //give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immediately
         Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY );
         if( xNewSeriesProps.is() )
-            xNewSeriesProps->setPropertyValue(CHART_UNONAME_NUMFMT , uno::makeAny(nSeriesNumberFormat));
+            xNewSeriesProps->setPropertyValue(CHART_UNONAME_NUMFMT , uno::Any(nSeriesNumberFormat));
     }
 
     updateFromModel();
@@ -698,13 +698,13 @@ bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const
 bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue )
 {
     return (getCellType( nAtColumn, nAtRow ) == NUMBER) &&
-        setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue ));
+        setCellAny( nAtColumn, nAtRow, uno::Any( fValue ));
 }
 
 bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText )
 {
     return (getCellType( nAtColumn, nAtRow ) == TEXT) &&
-        setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
+        setCellAny( nAtColumn, nAtRow, uno::Any( rText ));
 }
 
 sal_Int32 DataBrowserModel::getColumnCount() const
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 08f391de5035..e6cdc9220170 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -262,7 +262,7 @@ void lcl_SetSequenceRole(
 {
     Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY );
     if( xProp.is())
-        xProp->setPropertyValue( "Role" , uno::makeAny( rRole ));
+        xProp->setPropertyValue( "Role" , uno::Any( rRole ));
 }
 
 Reference< XDataSeries > lcl_CreateNewSeries(
@@ -288,7 +288,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
             // without setting it as hard attribute
             Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
             if( xColorScheme.is())
-                xResultProp->setPropertyValue( "Color" , uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex )));
+                xResultProp->setPropertyValue( "Color" , uno::Any( xColorScheme->getColorByIndex( nNewSeriesIndex )));
         }
         sal_Int32 nGroupIndex=0;
         if( xChartType.is())
@@ -816,7 +816,7 @@ void DialogModel::applyInterpretedData(
                             Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
                             if( xColorScheme.is())
                                 xSeriesProp->setPropertyValue( "Color" ,
-                                    uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter )));
+                                    uno::Any( xColorScheme->getColorByIndex( nSeriesCounter )));
                         }
                         m_xTemplate->applyStyle( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup );
                     }
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 013c625fa028..addc52a5202b 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -120,17 +120,17 @@ bool RangeSelectionHelper::chooseRange(
         {
             Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
-                "InitialValue", -1, uno::makeAny( aCurrentRange ),
+                "InitialValue", -1, uno::Any( aCurrentRange ),
                 beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
                 "Title", -1,
-                uno::makeAny( aUIString ),
+                uno::Any( aUIString ),
                 beans::PropertyState_DIRECT_VALUE );
             aArgs[2] = beans::PropertyValue(
-                "CloseOnMouseRelease", -1, uno::makeAny( true ),
+                "CloseOnMouseRelease", -1, uno::Any( true ),
                 beans::PropertyState_DIRECT_VALUE );
             aArgs[3] = beans::PropertyValue(
-                "MultiSelectionMode", -1, uno::makeAny( true ),
+                "MultiSelectionMode", -1, uno::Any( true ),
                 beans::PropertyState_DIRECT_VALUE );
 
             if( m_xRangeSelectionListener.is() )
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 096fecf0c1e5..c4c00cd1fcf5 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -313,7 +313,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
         {
             Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
             awt::Point aPoint(aRect.Left(),aRect.Top());
-            aRet = uno::makeAny( aPoint );
+            aRet = uno::Any( aPoint );
         }
     }
     else if( rPropertyName == "Size" )
@@ -326,12 +326,12 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
         {
             Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
             awt::Size aSize(aRect.GetWidth(),aRect.GetHeight());
-            aRet = uno::makeAny( aSize );
+            aRet = uno::Any( aSize );
         }
     }
     else if( rPropertyName == "UnlockControllersOnExecute" )
     {
-        aRet = uno::makeAny( m_bUnlockControllersOnExecute );
+        aRet = uno::Any( m_bUnlockControllersOnExecute );
     }
     else
         throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , nullptr );
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 6b268f90685a..23b89af61ef9 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -131,7 +131,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
         if( xProp.is() )
         {
             //show
-            xProp->setPropertyValue( "Show" , uno::makeAny( bShowLegend ));
+            xProp->setPropertyValue( "Show" , uno::Any( bShowLegend ));
 
             //position
             chart2::LegendPosition eNewPos;
@@ -154,8 +154,8 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
                 eExp = css::chart::ChartLegendExpansion_WIDE;
             }
 
-            xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
-            xProp->setPropertyValue( "Expansion" , uno::makeAny( eExp ));
+            xProp->setPropertyValue( "AnchorPosition" , uno::Any( eNewPos ));
+            xProp->setPropertyValue( "Expansion" , uno::Any( eExp ));
             xProp->setPropertyValue( "RelativePosition" , uno::Any());
         }
     }
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 602afffbaecf..8fa025917989 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -68,7 +68,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing:
     {
         uno::Reference< beans::XPropertySet > xDiaProp(
             ::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW );
-        xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::makeAny( aShadeMode ));
+        xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::Any( aShadeMode ));
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index f07864ffc835..77e0d0c660ba 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -218,8 +218,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
 
     try
     {
-        m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::makeAny( aMode ));
-        m_xSceneProperties->setPropertyValue( "Perspective" , uno::makeAny( (sal_Int32)m_pMFPerspective->GetValue() ));
+        m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::Any( aMode ));
+        m_xSceneProperties->setPropertyValue( "Perspective" , uno::Any( (sal_Int32)m_pMFPerspective->GetValue() ));
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a8778965b56f..59e6108abe63 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -160,11 +160,11 @@ namespace
             try
             {
                 xSceneProperties->setPropertyValue( "D3DSceneLightColor" + aIndex,
-                                                    uno::makeAny( rLightSource.nDiffuseColor ));
+                                                    uno::Any( rLightSource.nDiffuseColor ));
                 xSceneProperties->setPropertyValue( "D3DSceneLightDirection" + aIndex,
-                                                    uno::makeAny( rLightSource.aDirection ));
+                                                    uno::Any( rLightSource.aDirection ));
                 xSceneProperties->setPropertyValue( "D3DSceneLightOn" + aIndex,
-                                                    uno::makeAny( rLightSource.bIsEnabled ));
+                                                    uno::Any( rLightSource.bIsEnabled ));
             }
             catch( const uno::Exception & ex )
             {
@@ -199,7 +199,7 @@ namespace
         try
         {
             xSceneProperties->setPropertyValue("D3DSceneAmbientColor",
-                                               uno::makeAny( rColor.GetColor()));
+                                               uno::Any( rColor.GetColor()));
         }
         catch( const uno::Exception & ex )
         {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index df92cc0e680d..183073ca4fc4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -913,7 +913,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                                     // "$Sheet1.$A$1"
                                     aRange = xNewSeq->getSourceRangeRepresentation();
                                     Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
-                                    xProp->setPropertyValue( "Role" , uno::makeAny( lcl_aLabelRole ));
+                                    xProp->setPropertyValue( "Role" , uno::Any( lcl_aLabelRole ));
                                     xLabeledSeq->setLabel( xNewSeq );
                                 }
                             }
@@ -945,7 +945,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                                 aRange = xNewSeq->getSourceRangeRepresentation();
 
                                 Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
-                                xProp->setPropertyValue( "Role" , uno::makeAny( aSelectedRole ));
+                                xProp->setPropertyValue( "Role" , uno::Any( aSelectedRole ));
                                 if( !xLabeledSeq.is())
                                 {
                                     if( aSelectedRole == aSequenceNameForLabel )
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 62ce33ac5f1b..deac1fd39d99 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -253,7 +253,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
         {
             aArguments.realloc( aArguments.getLength() + 1 );
             aArguments[aArguments.getLength() - 1] =
-                beans::PropertyValue( "TimeBased", -1, uno::makeAny(bTimeBased),
+                beans::PropertyValue( "TimeBased", -1, uno::Any(bTimeBased),
                         beans::PropertyState_DIRECT_VALUE );
         }
 
@@ -264,7 +264,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
             aArguments.realloc( aArguments.getLength() + 1 );
             aArguments[aArguments.getLength() - 1] =
                 beans::PropertyValue( "CellRangeRepresentation" , -1,
-                                      uno::makeAny( m_aLastValidRangeString ),
+                                      uno::Any( m_aLastValidRangeString ),
                                       beans::PropertyState_DIRECT_VALUE );
             m_rDialogModel.setData( aArguments );
             m_bIsDirty = false;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index fbb79d052b49..192fd3dec453 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -582,7 +582,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                     TimeInterval aTimeInterval;
                     aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
                     aValue >>= aTimeInterval.TimeUnit;
-                    aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+                    aScale.TimeIncrement.MajorTimeInterval <<= aTimeInterval;
                     bSetScale = true;
                 }
             }
@@ -601,7 +601,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                         TimeInterval aTimeInterval;
                         aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
                         aTimeInterval.Number = static_cast<sal_Int32>(fValue);
-                        aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+                        aScale.TimeIncrement.MajorTimeInterval <<= aTimeInterval;
                         bSetScale = true;
                     }
                 }
@@ -640,7 +640,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                     TimeInterval aTimeInterval;
                     aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
                     aValue >>= aTimeInterval.TimeUnit;
-                    aScale.TimeIncrement.MinorTimeInterval = uno::makeAny( aTimeInterval );
+                    aScale.TimeIncrement.MinorTimeInterval <<= aTimeInterval;
                     bSetScale = true;
                 }
             }
@@ -656,7 +656,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                     TimeInterval aTimeInterval;
                     aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
                     aValue >>= aTimeInterval.Number;
-                    aScale.TimeIncrement.MinorTimeInterval = uno::makeAny(aTimeInterval);
+                    aScale.TimeIncrement.MinorTimeInterval <<= aTimeInterval;
                     bSetScale = true;
                 }
                 else if( aScale.IncrementData.SubIncrements.getLength() > 0 )
@@ -733,11 +733,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                                 double fValue = 0.0;
                                 if( aValue >>= fValue )
                                 {
-                                    xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_VALUE ));
-                                    xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
+                                    xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_VALUE ));
+                                    xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::Any( fValue ));
                                 }
                                 else
-                                    xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_START ));
+                                    xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_START ));
                             }
                         }
                     }
@@ -757,7 +757,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
             if( !bPropExisted || ( eOldAxisPos != eAxisPos ))
             {
-                GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::makeAny( eAxisPos ));
+                GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::Any( eAxisPos ));
                 bChangedOtherwise = true;
 
                 //move the parallel axes to the other side if necessary
@@ -775,7 +775,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                                     (eAxisPos==css::chart::ChartAxisPosition_START)
                                     ? css::chart::ChartAxisPosition_END
                                     : css::chart::ChartAxisPosition_START;
-                                xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( eOppositePos ));
+                                xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::Any( eOppositePos ));
                             }
                         }
                     }
@@ -793,7 +793,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
             if( !bPropExisted || ( fOldValue != fValue ))
             {
-                GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
+                GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::Any( fValue ));
                 bChangedOtherwise = true;
 
                 //keep old and new settings for axis positioning in sync somehow
@@ -809,7 +809,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                         if( xCrossingMainAxis.is() )
                         {
                             ScaleData aCrossingScale( xCrossingMainAxis->getScaleData() );
-                            aCrossingScale.Origin = uno::makeAny(fValue);
+                            aCrossingScale.Origin = uno::Any(fValue);
                             xCrossingMainAxis->setScaleData(aCrossingScale);
                         }
                     }
@@ -829,7 +829,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
             if( !bPropExisted || ( eOldPos != ePos ))
             {
-                GetPropertySet()->setPropertyValue( "LabelPosition" , uno::makeAny( ePos ));
+                GetPropertySet()->setPropertyValue( "LabelPosition" , uno::Any( ePos ));
                 bChangedOtherwise = true;
 
                 //move the parallel axes to the other side if necessary
@@ -847,7 +847,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                                     (ePos==css::chart::ChartAxisLabelPosition_OUTSIDE_START)
                                     ? css::chart::ChartAxisLabelPosition_OUTSIDE_END
                                     : css::chart::ChartAxisLabelPosition_OUTSIDE_START;
-                                xParallelAxis->setPropertyValue( "LabelPosition" , uno::makeAny( eOppositePos ));
+                                xParallelAxis->setPropertyValue( "LabelPosition" , uno::Any( eOppositePos ));
                             }
                         }
                     }
@@ -867,7 +867,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
             if( !bPropExisted || ( eOldPos != ePos ))
             {
-                GetPropertySet()->setPropertyValue( "MarkPosition" , uno::makeAny( ePos ));
+                GetPropertySet()->setPropertyValue( "MarkPosition" , uno::Any( ePos ));
                 bChangedOtherwise = true;
             }
         }
@@ -885,7 +885,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
             if( ! bPropExisted || fOldVal != fVal )
             {
-                GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
+                GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fVal ));
                 bChangedOtherwise = true;
             }
         }
@@ -905,7 +905,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                         static_cast< const SfxUInt32Item & >(
                             rItemSet.Get( nWhichId )).GetValue());
 
-                    aValue = uno::makeAny(nFmt);
+                    aValue <<= nFmt;
                     if (GetPropertySet()->getPropertyValue(CHART_UNONAME_NUMFMT) != aValue)
                     {
                         GetPropertySet()->setPropertyValue(CHART_UNONAME_NUMFMT , aValue);
@@ -921,7 +921,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
             bool bUseSourceFormat =
                 (static_cast< const SfxBoolItem & >(
                     rItemSet.Get( nWhichId )).GetValue() );
-            GetPropertySet()->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::makeAny(bUseSourceFormat));
+            GetPropertySet()->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::Any(bUseSourceFormat));
 
             bool bNumberFormatIsSet = GetPropertySet()->getPropertyValue(CHART_UNONAME_NUMFMT).hasValue();
 
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 503a588061dc..3bc9114bd8b8 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -528,7 +528,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
                         if (m_pRefSize && GetRefSizePropertySet()->getPropertyValue( m_aRefSizePropertyName ).hasValue())
                         {
                             GetRefSizePropertySet()->setPropertyValue(
-                                m_aRefSizePropertyName, uno::makeAny(*m_pRefSize));
+                                m_aRefSizePropertyName, uno::Any(*m_pRefSize));
                         }
 
                         GetPropertySet()->setPropertyValue( "CharHeight" + aPostfix, aValue );
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 6fc7aef87ba3..4d1575a7fa81 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -115,7 +115,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe
             sal_Int32 nFmt = static_cast< sal_Int32 >(
                 static_cast< const SfxUInt32Item & >(
                     rItemSet.Get( nWhichId )).GetValue());
-            aValue = uno::makeAny(nFmt);
+            aValue <<= nFmt;
         }
         else
             return bChanged;
@@ -315,13 +315,13 @@ bool DataPointItemConverter::ApplySpecialItem(
                     if( bOldValue != bool(rValue) ||
                         DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, CHART_UNONAME_LABEL , aOldValue ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL , uno::makeAny( aLabel ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL , uno::Any( aLabel ) );
                         bChanged = true;
                     }
                 }
                 else if( bOldValue != bool(rValue) )
                 {
-                    GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL , uno::makeAny(aLabel));
+                    GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL , uno::Any(aLabel));
                     bChanged = true;
                 }
             }
@@ -353,15 +353,15 @@ bool DataPointItemConverter::ApplySpecialItem(
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
                     if( !aOldValue.equals(aNewValue) ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::makeAny( aOldValue ) ) )
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::Any( aOldValue ) ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::makeAny( aNewValue ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::Any( aNewValue ) );
                         bChanged = true;
                     }
                 }
                 else if( !aOldValue.equals(aNewValue) )
                 {
-                    GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::makeAny( aNewValue ));
+                    GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::Any( aNewValue ));
                     bChanged = true;
                 }
             }
@@ -384,15 +384,15 @@ bool DataPointItemConverter::ApplySpecialItem(
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
                     if( bOld!=bNew ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::makeAny( bOld ) ) )
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::Any( bOld ) ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::makeAny( bNew ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::Any( bNew ) );
                         bChanged = true;
                     }
                 }
                 else if( bOld!=bNew )
                 {
-                    GetPropertySet()->setPropertyValue( "TextWordWrap", uno::makeAny( bNew ));
+                    GetPropertySet()->setPropertyValue( "TextWordWrap", uno::Any( bNew ));
                     bChanged = true;
                 }
             }
@@ -419,15 +419,15 @@ bool DataPointItemConverter::ApplySpecialItem(
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
                     if( nOld!=nNew ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::makeAny( nOld ) ) )
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::Any( nOld ) ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::makeAny( nNew ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::Any( nNew ) );
                         bChanged = true;
                     }
                 }
                 else if( nOld!=nNew )
                 {
-                    GetPropertySet()->setPropertyValue( "LabelPlacement" , uno::makeAny( nNew ));
+                    GetPropertySet()->setPropertyValue( "LabelPlacement" , uno::Any( nNew ));
                     bChanged = true;
                 }
             }
@@ -474,7 +474,7 @@ bool DataPointItemConverter::ApplySpecialItem(
                 if( bDeleteSymbol )
                     GetPropertySet()->setPropertyValue( "Symbol" , uno::Any());
                 else
-                    GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
+                    GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol ));
                 bChanged = true;
             }
         }
@@ -493,7 +493,7 @@ bool DataPointItemConverter::ApplySpecialItem(
                 aSymbol.Size.Width = aSize.getWidth();
                 aSymbol.Size.Height = aSize.getHeight();
 
-                GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
+                GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol ));
                 bChanged = true;
             }
         }
@@ -516,7 +516,7 @@ bool DataPointItemConverter::ApplySpecialItem(
                     if( aSymbol.Graphic != xGraphic )
                     {
                         aSymbol.Graphic = xGraphic;
-                        GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
+                        GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol ));
                         bChanged = true;
                     }
                 }
@@ -535,7 +535,7 @@ bool DataPointItemConverter::ApplySpecialItem(
 
             if( ! bPropExisted || fOldValue != fValue )
             {
-                GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fValue ));
+                GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -567,7 +567,7 @@ void DataPointItemConverter::FillSpecialItem(
                 if( m_bOverwriteLabelsForAttributedDataPointsAlso )
                 {
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue(
-                        Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), CHART_UNONAME_LABEL , uno::makeAny(aLabel) ) )
+                        Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), CHART_UNONAME_LABEL , uno::Any(aLabel) ) )
                     {
                         rOutItemSet.InvalidateItem(nWhichId);
                     }
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index d92889b596ad..3226db77513e 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -182,7 +182,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
                         nStyle = css::chart::ErrorBarStyle::FROM_DATA; break;
                 }
 
-                xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
+                xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::Any( nStyle ));
                 bChanged = true;
             }
         }
@@ -203,8 +203,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
             if( ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
                     ::rtl::math::approxEqual( fNeg, fValue )))
             {
-                xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
-                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -220,7 +220,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
 
             if( ! ::rtl::math::approxEqual( fPos, fValue ))
             {
-                GetPropertySet()->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+                GetPropertySet()->setPropertyValue( "PositiveError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -238,7 +238,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
 
             if( ! ::rtl::math::approxEqual( fNeg, fValue ))
             {
-                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -261,8 +261,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
             if( ( bShowPos != bNewIndPos ||
                   bShowNeg != bNewIndNeg ))
             {
-                xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
-                xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
+                xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::Any( bNewIndPos ));
+                xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::Any( bNewIndNeg ));
                 bChanged = true;
             }
         }
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index dffa2cde9337..a86c32053a9c 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -748,7 +748,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                               ? OUString( "TransparencyGradientName" )
                               : OUString( "FillTransparenceGradientName" );
                         GetPropertySet()->setPropertyValue(
-                            aTransGradPropName, uno::makeAny( OUString() ));
+                            aTransGradPropName, uno::Any( OUString() ));
 
                         bChanged = true;
                     }
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 6a7969639c40..b3267044ad5e 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -110,7 +110,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
                 if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) ||
                     ( bWasShown != bShow ))
                 {
-                    GetPropertySet()->setPropertyValue( "Show" , uno::makeAny( bShow ));
+                    GetPropertySet()->setPropertyValue( "Show" , uno::Any( bShow ));
                     bChanged = true;
                 }
             }
@@ -145,8 +145,8 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
                     if( ! ( GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eOldPos ) ||
                         ( eOldPos != eNewPos ))
                     {
-                        GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
-                        GetPropertySet()->setPropertyValue( "Expansion" , uno::makeAny( eExpansion ));
+                        GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::Any( eNewPos ));
+                        GetPropertySet()->setPropertyValue( "Expansion" , uno::Any( eExpansion ));
                         GetPropertySet()->setPropertyValue( "RelativePosition" , uno::Any());
                         bChanged = true;
                     }
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index f946b3b179c9..bf9ff244dc7b 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -49,7 +49,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co
         bool aSuccess = xProperties->getPropertyValue( aPropertyID ) >>= aOldValue;
         if (!aSuccess || aOldValue != aValue)
         {
-            xProperties->setPropertyValue( aPropertyID , uno::makeAny( aValue ));
+            xProperties->setPropertyValue( aPropertyID , uno::Any( aValue ));
             return true;
         }
     }
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 61efffaeeb1b..4ce6a9edc544 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -234,7 +234,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                             else if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() )
                                 aBarPositionSequence[nAxisIndex] = rBarPosition;
 
-                            xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(aBarPositionSequence) );
+                            xChartTypeProps->setPropertyValue( aPropName, uno::Any(aBarPositionSequence) );
                             bChanged = true;
                         }
                     }
@@ -255,7 +255,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                     (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) &&
                     bOldConnectBars != m_bConnectBars )
                 {
-                    xDiagramProperties->setPropertyValue( "ConnectBars" , uno::makeAny(m_bConnectBars) );
+                    xDiagramProperties->setPropertyValue( "ConnectBars" , uno::Any(m_bConnectBars) );
                     bChanged = true;
                 }
             }
@@ -274,7 +274,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                     (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) &&
                     bOldGroupBarsPerAxis != m_bGroupBarsPerAxis )
                 {
-                    xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::makeAny(m_bGroupBarsPerAxis) );
+                    xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::Any(m_bGroupBarsPerAxis) );
                     bChanged = true;
                 }
             }
@@ -289,7 +289,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                 uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                 if( xDiagramProperties.is() )
                 {
-                    xDiagramProperties->setPropertyValue( "StartingAngle" , uno::makeAny(m_nStartingAngle) );
+                    xDiagramProperties->setPropertyValue( "StartingAngle" , uno::Any(m_nStartingAngle) );
                     bChanged = true;
                 }
             }
@@ -326,7 +326,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                         uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                         if( xDiagramProperties.is() )
                         {
-                            xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::makeAny( nNew ));
+                            xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::Any( nNew ));
                             bChanged = true;
                         }
                     }
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 15a8aa7c39fc..472da2f121d6 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -182,7 +182,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co
         bool aSuccess = xProperties->getPropertyValue( aPropertyID ) >>= aOldValue;
         if (!aSuccess || aOldValue != aValue)
         {
-            xProperties->setPropertyValue( aPropertyID , uno::makeAny( aValue ));
+            xProperties->setPropertyValue( aPropertyID , uno::Any( aValue ));
             return true;
         }
     }
@@ -323,10 +323,10 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 {
                     xErrorBarProp = lcl_GetDefaultErrorBar();
                     GetPropertySet()->setPropertyValue( bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X),
-                                                        uno::makeAny( xErrorBarProp ));
+                                                        uno::Any( xErrorBarProp ));
                 }
 
-                xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
+                xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::Any( nStyle ));
                 bChanged = true;
             }
         }
@@ -353,8 +353,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
                     ::rtl::math::approxEqual( fNeg, fValue )))
             {
-                xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
-                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -378,7 +378,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( bOldHasErrorBar &&
                 ! ::rtl::math::approxEqual( fPos, fValue ))
             {
-                xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -401,7 +401,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( bOldHasErrorBar &&
                 ! ::rtl::math::approxEqual( fNeg, fValue ))
             {
-                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue ));
                 bChanged = true;
             }
         }
@@ -546,8 +546,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 ( bShowPos != bNewIndPos ||
                   bShowNeg != bNewIndNeg ))
             {
-                xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
-                xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
+                xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::Any( bNewIndPos ));
+                xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::Any( bNewIndNeg ));
                 bChanged = true;
             }
         }
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 1e7abf646beb..40e42a608ca2 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -106,7 +106,7 @@ bool numberFormatFromItemToPropertySet(
             sal_Int32 nFmt = static_cast<sal_Int32>(
                 static_cast<const SfxUInt32Item&>(
                     rItemSet.Get(nWhichId)).GetValue());
-            aValue = uno::makeAny(nFmt);
+            aValue = uno::Any(nFmt);
         }
         else
             return bChanged;
@@ -278,13 +278,13 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                     if (bOldValue != bool(rValue) ||
                         DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, CHART_UNONAME_LABEL, aOldValue))
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, CHART_UNONAME_LABEL, uno::Any(aLabel));
                         bChanged = true;
                     }
                 }
                 else if (bOldValue != bool(rValue))
                 {
-                    GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+                    GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
                     bChanged = true;
                 }
             }
@@ -313,15 +313,15 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                 {
                     Reference<chart2::XDataSeries> xSeries(GetPropertySet(), uno::UNO_QUERY);
                     if (!aOldValue.equals(aNewValue) ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelSeparator", uno::makeAny(aOldValue)))
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelSeparator", uno::Any(aOldValue)))
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelSeparator", uno::makeAny(aNewValue));
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelSeparator", uno::Any(aNewValue));
                         bChanged = true;
                     }
                 }
                 else if (!aOldValue.equals(aNewValue))
                 {
-                    GetPropertySet()->setPropertyValue("LabelSeparator", uno::makeAny(aNewValue));
+                    GetPropertySet()->setPropertyValue("LabelSeparator", uno::Any(aNewValue));
                     bChanged = true;
                 }
             }
@@ -343,15 +343,15 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
                     if( bOld!=bNew ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::makeAny( bOld ) ) )
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::Any( bOld ) ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::makeAny( bNew ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::Any( bNew ) );
                         bChanged = true;
                     }
                 }
                 else if( bOld!=bNew )
                 {
-                    GetPropertySet()->setPropertyValue( "TextWordWrap", uno::makeAny( bNew ));
+                    GetPropertySet()->setPropertyValue( "TextWordWrap", uno::Any( bNew ));
                     bChanged = true;
                 }
             }
@@ -376,15 +376,15 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                 {
                     Reference<chart2::XDataSeries> xSeries(GetPropertySet(), uno::UNO_QUERY);
                     if (nOld != nNew ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelPlacement", uno::makeAny(nOld)))
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelPlacement", uno::Any(nOld)))
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelPlacement", uno::makeAny(nNew));
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelPlacement", uno::Any(nNew));
                         bChanged = true;
                     }
                 }
                 else if (nOld != nNew)
                 {
-                    GetPropertySet()->setPropertyValue("LabelPlacement", uno::makeAny(nNew));
+                    GetPropertySet()->setPropertyValue("LabelPlacement", uno::Any(nNew));
                     bChanged = true;
                 }
             }
@@ -430,7 +430,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                 if (bDeleteSymbol)
                     GetPropertySet()->setPropertyValue("Symbol", uno::Any());
                 else
-                    GetPropertySet()->setPropertyValue("Symbol", uno::makeAny(aSymbol));
+                    GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol));
                 bChanged = true;
             }
         }
@@ -448,7 +448,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                 aSymbol.Size.Width = aSize.getWidth();
                 aSymbol.Size.Height = aSize.getHeight();
 
-                GetPropertySet()->setPropertyValue("Symbol", uno::makeAny(aSymbol));
+                GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol));
                 bChanged = true;
             }
         }
@@ -470,7 +470,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
                     if (aSymbol.Graphic != xGraphic)
                     {
                         aSymbol.Graphic = xGraphic;
-                        GetPropertySet()->setPropertyValue("Symbol", uno::makeAny(aSymbol));
+                        GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol));
                         bChanged = true;
                     }
                 }
@@ -488,7 +488,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
 
             if (!bPropExisted || fOldValue != fValue)
             {
-                GetPropertySet()->setPropertyValue("TextRotation", uno::makeAny(fValue));
+                GetPropertySet()->setPropertyValue("TextRotation", uno::Any(fValue));
                 bChanged = true;
             }
         }
@@ -519,7 +519,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r
                 if (mbDataSeries)
                 {
                     if (DataSeriesHelper::hasAttributedDataPointDifferentValue(
-                            Reference<chart2::XDataSeries>(GetPropertySet(), uno::UNO_QUERY), CHART_UNONAME_LABEL, uno::makeAny(aLabel)))
+                            Reference<chart2::XDataSeries>(GetPropertySet(), uno::UNO_QUERY), CHART_UNONAME_LABEL, uno::Any(aLabel)))
                     {
                         rOutItemSet.InvalidateItem(nWhichId);
                     }
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 79dcffcf1f2e..e8d964dd8611 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -178,7 +178,7 @@ bool TitleItemConverter::ApplySpecialItem(
 
             if( ! bPropExisted || fOldVal != fVal )
             {
-                GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
+                GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fVal ));
                 bChanged = true;
             }
         }
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index f9a5d76b7bde..06751063e540 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -629,7 +629,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
 
     // #i119999# Do not do this per default to allow the user to deselect the chart OLE with a single press to ESC
     // select chart area per default:
-    // select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+    // select( uno::Any( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
 
     uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), uno::UNO_QUERY );
     if( xFact.is())
@@ -1476,11 +1476,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
     if(xInit.is())
     {
         uno::Sequence< uno::Any > aArguments(5);
-        uno::Reference<view::XSelectionSupplier> xSelectionSupplier(this);
-        aArguments[0]=uno::makeAny(xSelectionSupplier);
-        uno::Reference<frame::XModel> xModel(getModel());
-        aArguments[1]=uno::makeAny(xModel);
-        aArguments[2]=uno::makeAny(m_xChartView);
+        aArguments[0] <<= uno::Reference<view::XSelectionSupplier>(this);
+        aArguments[1] <<= uno::Reference<frame::XModel>(getModel());
+        aArguments[2] <<= m_xChartView;
         uno::Reference< XAccessible > xParent;
         {
             SolarMutexGuard aGuard;
@@ -1491,8 +1489,8 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
                     xParent.set( pParentWin->GetAccessible());
             }
         }
-        aArguments[3]=uno::makeAny(xParent);
-        aArguments[4]=uno::makeAny(m_xViewWindow);
+        aArguments[3] <<= xParent;
+        aArguments[4] <<= m_xViewWindow;
 
         xInit->initialize(aArguments);
     }
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 7d3a5a6c675d..20b8f010a777 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -533,10 +533,10 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
                 ActionDescriptionProvider::createDescription(
                     ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
                 m_xUndoManager );
-            xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true ));
-            xEqProp->setPropertyValue( "XName", uno::makeAny( OUString("x") ));
-            xEqProp->setPropertyValue( "YName", uno::makeAny( OUString("f(x)") ));
-            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 ));
+            xEqProp->setPropertyValue( "ShowEquation", uno::Any( true ));
+            xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") ));
+            xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x)") ));
+            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( bInsertR2 ));
             aUndoGuard.commit();
         }
     }
@@ -552,7 +552,7 @@ void ChartController::executeDispatch_InsertR2Value()
             ActionDescriptionProvider::createDescription(
                 ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
             m_xUndoManager );
-        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true ));
+        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( true ));
         aUndoGuard.commit();
     }
 }
@@ -567,7 +567,7 @@ void ChartController::executeDispatch_DeleteR2Value()
             ActionDescriptionProvider::createDescription(
                 ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
             m_xUndoManager );
-        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
+        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false ));
         aUndoGuard.commit();
     }
 }
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 49dd8a81e3ca..9d958fc69bd8 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -69,7 +69,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
     //#i77362 change notification for changes on additional shapes are missing
     uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
     if( xChartViewProps.is() )
-        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(true) );
+        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::Any(true) );
 
     bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
                     , m_pDrawViewWrapper->GetPageView()
@@ -109,7 +109,7 @@ bool ChartController::EndTextEdit()
     //#i77362 change notification for changes on additional shapes are missing
     uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
     if( xChartViewProps.is() )
-        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(false) );
+        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::Any(false) );
 
     SdrObject* pTextObject = m_pDrawViewWrapper->getTextEditObject();
     if(!pTextObject)
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 6ec875364fda..7733e549f83c 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -355,7 +355,7 @@ void ChartController::impl_PasteGraphic(
             m_aSelection.setSelection( xGraphicShape );
             m_aSelection.applySelection( m_pDrawViewWrapper );
         }
-        xGraphicShapeProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic ));
+        xGraphicShapeProp->setPropertyValue( "Graphic", uno::Any( xGraphic ));
         uno::Reference< beans::XPropertySet > xGraphicProp( xGraphic, uno::UNO_QUERY );
 
         awt::Size aGraphicSize( 1000, 1000 );
@@ -450,14 +450,14 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
 
                 float fCharHeight = 10.0;
                 Reference< beans::XPropertySet > xProperties( xTextShape, uno::UNO_QUERY_THROW );
-                xProperties->setPropertyValue( "TextAutoGrowHeight", uno::makeAny( true ) );
-                xProperties->setPropertyValue( "TextAutoGrowWidth", uno::makeAny( true ) );
-                xProperties->setPropertyValue( "CharHeight", uno::makeAny( fCharHeight ) );
-                xProperties->setPropertyValue( "CharHeightAsian", uno::makeAny( fCharHeight ) );
-                xProperties->setPropertyValue( "CharHeightComplex", uno::makeAny( fCharHeight ) );
-                xProperties->setPropertyValue( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER ) );
-                xProperties->setPropertyValue( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER ) );
-                xProperties->setPropertyValue( "CharFontName", uno::makeAny( OUString("Albany") ) );
+                xProperties->setPropertyValue( "TextAutoGrowHeight", uno::Any( true ) );
+                xProperties->setPropertyValue( "TextAutoGrowWidth", uno::Any( true ) );
+                xProperties->setPropertyValue( "CharHeight", uno::Any( fCharHeight ) );
+                xProperties->setPropertyValue( "CharHeightAsian", uno::Any( fCharHeight ) );
+                xProperties->setPropertyValue( "CharHeightComplex", uno::Any( fCharHeight ) );
+                xProperties->setPropertyValue( "TextVerticalAdjust", uno::Any( drawing::TextVerticalAdjust_CENTER ) );
+                xProperties->setPropertyValue( "TextHorizontalAdjust", uno::Any( drawing::TextHorizontalAdjust_CENTER ) );
+                xProperties->setPropertyValue( "CharFontName", uno::Any( OUString("Albany") ) );
 
                 xTextShape->setPosition( rPosition );
 
@@ -635,7 +635,7 @@ bool ChartController::executeDispatch_Delete()
                             ActionDescriptionProvider::createDescription(
                                 ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )),
                             m_xUndoManager );
-                        xLegendProp->setPropertyValue( "Show", uno::makeAny( false ));
+                        xLegendProp->setPropertyValue( "Show", uno::Any( false ));
                         bReturn = true;
                         aUndoGuard.commit();
                     }
@@ -708,10 +708,10 @@ bool ChartController::executeDispatch_Delete()
                         m_xUndoManager );
                     {
                         ControllerLockGuardUNO aCtlLockGuard( xModel );
-                        xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false ));
-                        xEqProp->setPropertyValue( "XName", uno::makeAny( OUString("x") ));
-                        xEqProp->setPropertyValue( "YName", uno::makeAny( OUString("f(x)") ));
-                        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
+                        xEqProp->setPropertyValue( "ShowEquation", uno::Any( false ));
+                        xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") ));
+                        xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x)") ));
+                        xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false ));
                     }
                     bReturn = true;
                     aUndoGuard.commit();
@@ -745,7 +745,7 @@ bool ChartController::executeDispatch_Delete()
                         ControllerLockGuardUNO aCtlLockGuard( xModel );
                         xErrorBarProp->setPropertyValue(
                             "ErrorBarStyle",
-                            uno::makeAny( css::chart::ErrorBarStyle::NONE ));
+                            uno::Any( css::chart::ErrorBarStyle::NONE ));
                     }
                     bReturn = true;
                     aUndoGuard.commit();
@@ -774,10 +774,10 @@ bool ChartController::executeDispatch_Delete()
                     if( aObjectType == OBJECTTYPE_DATA_LABELS )
                     {
                         uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
-                        ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL, uno::makeAny(aLabel) );
+                        ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL, uno::Any(aLabel) );
                     }
                     else
-                        xObjectProperties->setPropertyValue( CHART_UNONAME_LABEL, uno::makeAny(aLabel) );
+                        xObjectProperties->setPropertyValue( CHART_UNONAME_LABEL, uno::Any(aLabel) );
                     bReturn = true;
                     aUndoGuard.commit();
                 }
@@ -839,7 +839,7 @@ void ChartController::executeDispatch_ToggleLegend()
             bool bShow = false;
             if( xLegendProp->getPropertyValue( "Show") >>= bShow )
             {
-                xLegendProp->setPropertyValue( "Show", uno::makeAny( ! bShow ));
+                xLegendProp->setPropertyValue( "Show", uno::Any( ! bShow ));
                 bChanged = true;
             }
         }
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 5f37b989d208..ad0248e0cc73 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -250,12 +250,12 @@ void SAL_CALL ChartController::setPosSize(
         if( xProp.is() )
         {
             auto aZoomFactors(::comphelper::InitPropertySequence({
-                { "ScaleXNumerator", uno::makeAny( nScaleXNumerator ) },
-                { "ScaleXDenominator", uno::makeAny( nScaleXDenominator ) },
-                { "ScaleYNumerator", uno::makeAny( nScaleYNumerator ) },
-                { "ScaleYDenominator", uno::makeAny( nScaleYDenominator ) }
+                { "ScaleXNumerator", uno::Any( nScaleXNumerator ) },
+                { "ScaleXDenominator", uno::Any( nScaleXDenominator ) },
+                { "ScaleYNumerator", uno::Any( nScaleYNumerator ) },
+                { "ScaleYDenominator", uno::Any( nScaleYDenominator ) }
             }));
-            xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors ));
+            xProp->setPropertyValue( "ZoomFactors", uno::Any( aZoomFactors ));
         }
 
         //a correct work area is at least necessary for correct values in the position and  size dialog and for dragging area
@@ -461,7 +461,7 @@ void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const Re
                     aResolution.Height = m_pChartWindow->GetSizePixel().Height();
                 }
             }
-            xProp->setPropertyValue( "Resolution", uno::makeAny( aResolution ));
+            xProp->setPropertyValue( "Resolution", uno::Any( aResolution ));
         }
 
         uno::Reference< util::XUpdatable > xUpdatable( m_xChartView, uno::UNO_QUERY );
@@ -1601,12 +1601,12 @@ uno::Any SAL_CALL ChartController::getSelection()
         OUString aCID( m_aSelection.getSelectedCID() );
         if ( !aCID.isEmpty() )
         {
-            aReturn = uno::makeAny( aCID );
+            aReturn = uno::Any( aCID );
         }
         else
         {
             // #i12587# support for shapes in chart
-            aReturn = uno::makeAny( m_aSelection.getSelectedAdditionalShape() );
+            aReturn = uno::Any( m_aSelection.getSelectedAdditionalShape() );
         }
     }
     return aReturn;
@@ -1736,9 +1736,9 @@ bool ChartController::impl_moveOrResizeObject(
                     eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager );
             {
                 ControllerLockGuardUNO aCLGuard( xChartModel );
-                xObjProp->setPropertyValue( "RelativePosition", uno::makeAny( aRelPos ));
+                xObjProp->setPropertyValue( "RelativePosition", uno::Any( aRelPos ));
                 if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicit size at the diagram when an explicit position is set
-                    xObjProp->setPropertyValue( "RelativeSize", uno::makeAny( aRelSize ));
+                    xObjProp->setPropertyValue( "RelativeSize", uno::Any( aRelSize ));
             }
             aUndoGuard.commit();
         }
@@ -1770,7 +1770,7 @@ bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditio
                     fOffset = 1.0;
                 else if( fOffset < 0.0 )
                     fOffset = 0.0;
-                xPointProp->setPropertyValue( "Offset", uno::makeAny( fOffset ));
+                xPointProp->setPropertyValue( "Offset", uno::Any( fOffset ));
                 bResult = true;
             }
         }
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index ebe2b989e7bb..b32c5de1d01b 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -550,12 +550,12 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     // toolbar commands
     m_aCommandAvailability[ ".uno:ToggleGridHorizontal" ] = bIsWritable;
-    m_aCommandArguments[ ".uno:ToggleGridHorizontal" ] = uno::makeAny( m_apModelState->bHasMainYGrid );
+    m_aCommandArguments[ ".uno:ToggleGridHorizontal" ] <<= m_apModelState->bHasMainYGrid;
     m_aCommandAvailability[ ".uno:ToggleGridVertical" ] = bIsWritable;
-    m_aCommandArguments[ ".uno:ToggleGridVertical" ] = uno::makeAny( m_apModelState->bHasMainXGrid );
+    m_aCommandArguments[ ".uno:ToggleGridVertical" ] <<= m_apModelState->bHasMainXGrid;
 
     m_aCommandAvailability[ ".uno:ToggleLegend" ] = bIsWritable;
-    m_aCommandArguments[ ".uno:ToggleLegend" ] = uno::makeAny( m_apModelState->bHasLegend );
+    m_aCommandArguments[ ".uno:ToggleLegend" ] <<= m_apModelState->bHasLegend;
 
     m_aCommandAvailability[ ".uno:NewArrangement" ] = bIsWritable;
     m_aCommandAvailability[ ".uno:Update" ] = bIsWritable;
@@ -628,7 +628,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     // text
     m_aCommandAvailability[ ".uno:ScaleText" ] = bIsWritable && bModelStateIsValid ;
-    m_aCommandArguments[ ".uno:ScaleText" ] = uno::makeAny( m_apModelState->bHasAutoScaledText );
+    m_aCommandArguments[ ".uno:ScaleText" ] <<= m_apModelState->bHasAutoScaledText;
 
     // axes
     m_aCommandAvailability[ ".uno:DiagramAxisX" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis;
@@ -737,7 +737,7 @@ void ControllerCommandDispatch::fireStatusEvent(
     if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
     {
         bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xChartController.get() ));
-        fireStatusEventForURL( ".uno:StatusBarVisible", uno::makeAny( bIsStatusBarVisible ), true, xSingleListener );
+        fireStatusEventForURL( ".uno:StatusBarVisible", uno::Any( bIsStatusBarVisible ), true, xSingleListener );
     }
 }
 
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index d2eaa2b5cebf..845bb7c65591 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -116,7 +116,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/)
             Reference< beans::XPropertySet > xPointProperties(
                 ObjectIdentifier::getObjectPropertySet( m_aObjectCID, xChartModel ) );
             if( xPointProperties.is() )
-                xPointProperties->setPropertyValue( "Offset", uno::makeAny( m_fAdditionalOffset+m_fInitialOffset ));
+                xPointProperties->setPropertyValue( "Offset", uno::Any( m_fAdditionalOffset+m_fInitialOffset ));
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index e938ea517fa6..6280ecb2be56 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -55,7 +55,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
         Point aPos = aObjectRect.TopLeft();
         aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0)/double(aPageRect.getWidth());
         aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getHeight())/2.0)/double(aPageRect.getHeight());
-        xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
     }
     else if( OBJECTTYPE_DATA_CURVE_EQUATION==eObjectType )
     {
@@ -66,12 +66,12 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
         Point aPos = aObjectRect.TopLeft();
         aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth());
         aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight());
-        xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
     }
     else if(OBJECTTYPE_LEGEND==eObjectType)
     {
-        xObjectProp->setPropertyValue( "AnchorPosition", uno::makeAny(LegendPosition(LegendPosition_CUSTOM)));
-        xObjectProp->setPropertyValue( "Expansion", uno::makeAny(css::chart::ChartLegendExpansion_CUSTOM));
+        xObjectProp->setPropertyValue( "AnchorPosition", uno::Any(LegendPosition(LegendPosition_CUSTOM)));
+        xObjectProp->setPropertyValue( "Expansion", uno::Any(css::chart::ChartLegendExpansion_CUSTOM));
         chart2::RelativePosition aRelativePosition;
         chart2::RelativeSize aRelativeSize;
         Point aAnchor = aObjectRect.TopLeft();
@@ -83,7 +83,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
             static_cast< double >( aAnchor.Y()) /
             static_cast< double >( aPageRect.getHeight());
 
-        xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
 
         aRelativeSize.Primary =
             static_cast< double >( aObjectRect.getWidth()) /
@@ -96,7 +96,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
         if (aRelativeSize.Secondary > 1.0)
             aRelativeSize.Secondary = 1.0;
 
-        xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) );
+        xObjectProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) );
     }
     else if(OBJECTTYPE_DIAGRAM==eObjectType || OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType)
     {
@@ -109,7 +109,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
         Point aPos = aObjectRect.Center();
         aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth());
         aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight());
-        xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+        xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
 
         //set size:
         RelativeSize aRelativeSize;
@@ -117,7 +117,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
         //and in the middle of the page
         aRelativeSize.Primary = double(aObjectRect.getWidth())/double(aPageRect.getWidth());
         aRelativeSize.Secondary = double(aObjectRect.getHeight())/double(aPageRect.getHeight());
-        xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) );
+        xObjectProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) );
     }
     else
         return false;
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index d778ac428bc3..596e08fa8474 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -114,7 +114,7 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
     {
         throw css::lang::WrappedTargetRuntimeException(
             "ChartPanelFactory::createUIElement exception",
-            nullptr, css::uno::makeAny(e));
+            nullptr, css::uno::Any(e));
     }
 
     return xElement;
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index d8612e542ba2..41c4b9c9c4d0 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -294,7 +294,7 @@ void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem& rItem)
     if (!xPropSet.is())
         return;
 
-    xPropSet->setPropertyValue("FillTransparence", css::uno::makeAny(rItem.GetValue()));
+    xPropSet->setPropertyValue("FillTransparence", css::uno::Any(rItem.GetValue()));
 }
 
 void ChartAreaPanel::setFillFloatTransparence(
@@ -307,7 +307,7 @@ void ChartAreaPanel::setFillFloatTransparence(
 
     if (!rItem.IsEnabled())
     {
-        xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::makeAny(OUString()));
+        xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(OUString()));
         return;
     }
 
@@ -315,7 +315,7 @@ void ChartAreaPanel::setFillFloatTransparence(
     css::uno::Any aGradientVal;
     rItem.QueryValue(aGradientVal, MID_FILLGRADIENT);
     OUString aNewName = PropertyHelper::addTransparencyGradientUniqueNameToTable(aGradientVal, css::uno::Reference<css::lang::XMultiServiceFactory>(mxModel, css::uno::UNO_QUERY_THROW), aName);
-    xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::makeAny(aNewName));
+    xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(aNewName));
 }
 
 void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem)
@@ -325,7 +325,7 @@ void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem)
     if (!xPropSet.is())
         return;
 
-    xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(rItem.GetValue()));
+    xPropSet->setPropertyValue("FillStyle", css::uno::Any(rItem.GetValue()));
 }
 
 void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem,
@@ -336,8 +336,8 @@ void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem,
         return;
 
     if (pStyleItem)
-        xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue()));
-    xPropSet->setPropertyValue("FillColor", css::uno::makeAny(rColorItem.GetValue()));
+        xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue()));
+    xPropSet->setPropertyValue("FillColor", css::uno::Any(rColorItem.GetValue()));
 }
 
 void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem,
@@ -349,8 +349,8 @@ void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem,
         return;
 
     if (pStyleItem)
-        xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue()));
-    xPropSet->setPropertyValue("FillGradientName", css::uno::makeAny(rGradientItem.GetValue()));
+        xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue()));
+    xPropSet->setPropertyValue("FillGradientName", css::uno::Any(rGradientItem.GetValue()));
 }
 
 void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
@@ -362,8 +362,8 @@ void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
         return;
 
     if (pStyleItem)
-        xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue()));
-    xPropSet->setPropertyValue("FillHatchName", css::uno::makeAny(rHatchItem.GetValue()));
+        xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue()));
+    xPropSet->setPropertyValue("FillHatchName", css::uno::Any(rHatchItem.GetValue()));
 }
 
 void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
@@ -375,8 +375,8 @@ void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
         return;
 
     if (pStyleItem)
-        xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue()));
-    xPropSet->setPropertyValue("FillBitmapName", css::uno::makeAny(rBitmapItem.GetValue()));
+        xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue()));
+    xPropSet->setPropertyValue("FillBitmapName", css::uno::Any(rBitmapItem.GetValue()));
 }
 
 void ChartAreaPanel::updateData()
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 83492a5dece0..715f1e6c9700 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -68,7 +68,7 @@ void setLabelShown(const css::uno::Reference<css::frame::XModel>& xModel,
     if (!xAxis.is())
         return;
 
-    xAxis->setPropertyValue("DisplayLabels", css::uno::makeAny(bVisible));
+    xAxis->setPropertyValue("DisplayLabels", css::uno::Any(bVisible));
 }
 
 struct AxisLabelPosMap
@@ -124,7 +124,7 @@ void setLabelPosition(const css::uno::Reference<css::frame::XModel>& xModel,
             ePos = i.ePos;
     }
 
-    xAxis->setPropertyValue("LabelPosition", css::uno::makeAny(ePos));
+    xAxis->setPropertyValue("LabelPosition", css::uno::Any(ePos));
 }
 
 bool isReverse(const css::uno::Reference<css::frame::XModel>& xModel,
@@ -187,7 +187,7 @@ void setAxisRotation(const css::uno::Reference<css::frame::XModel>& xModel,
     if (!xAxis.is())
         return;
 
-    xAxis->setPropertyValue("TextRotation", css::uno::makeAny(nVal));
+    xAxis->setPropertyValue("TextRotation", css::uno::Any(nVal));
 }
 
 double getAxisRotation(const css::uno::Reference<css::frame::XModel>& xModel,
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index ee931d06503f..3387e47254d3 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -72,7 +72,7 @@ void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor)
     css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
     assert(xPropSet.is());
 
-    xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.first.GetColor()));
+    xPropSet->setPropertyValue(maPropertyName, css::uno::Any(rColor.first.GetColor()));
 }
 
 void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel>& xModel)
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index c037feadd012..d25b9232ff3c 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -264,8 +264,8 @@ void setLegendPos(const css::uno::Reference<css::frame::XModel>& xModel, sal_Int
             assert(false);
     }
 
-    xLegendProp->setPropertyValue("AnchorPosition", css::uno::makeAny(eLegendPos));
-    xLegendProp->setPropertyValue("Expansion", css::uno::makeAny(eExpansion));
+    xLegendProp->setPropertyValue("AnchorPosition", css::uno::Any(eLegendPos));
+    xLegendProp->setPropertyValue("Expansion", css::uno::Any(eExpansion));
 
     if (eLegendPos != chart2::LegendPosition_CUSTOM)
     {
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 28cc584ad4d6..f359d409f573 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -101,7 +101,7 @@ void setShowPositiveError(const css::uno::Reference<css::frame::XModel>& xModel,
     if (!xPropSet.is())
         return;
 
-    xPropSet->setPropertyValue("ShowPositiveError", css::uno::makeAny(bShow));
+    xPropSet->setPropertyValue("ShowPositiveError", css::uno::Any(bShow));
 }
 
 void setShowNegativeError(const css::uno::Reference<css::frame::XModel>& xModel,
@@ -113,7 +113,7 @@ void setShowNegativeError(const css::uno::Reference<css::frame::XModel>& xModel,
     if (!xPropSet.is())
         return;
 
-    xPropSet->setPropertyValue("ShowNegativeError", css::uno::makeAny(bShow));
+    xPropSet->setPropertyValue("ShowNegativeError", css::uno::Any(bShow));
 }
 
 struct ErrorBarTypeMap
@@ -174,7 +174,7 @@ void setTypePos(const css::uno::Reference<css::frame::XModel>& xModel,
             nApi = i.nApi;
     }
 
-    xPropSet->setPropertyValue("ErrorBarStyle", css::uno::makeAny(nApi));
+    xPropSet->setPropertyValue("ErrorBarStyle", css::uno::Any(nApi));
 }
 
 double getValue(const css::uno::Reference<css::frame::XModel>& xModel,
@@ -214,7 +214,7 @@ void setValue(const css::uno::Reference<css::frame::XModel>& xModel,
     if (eDir == ErrorBarDirection::NEGATIVE)
         aName = "NegativeError";
 
-    xPropSet->setPropertyValue(aName, css::uno::makeAny(nVal));
+    xPropSet->setPropertyValue(aName, css::uno::Any(nVal));
 }
 
 OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel)
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 8fefe156675e..186df8b22d7b 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -255,7 +255,7 @@ void ChartLinePanel::setLineStyle(const XLineStyleItem& rItem)
         return;
 
     PreventUpdate aPreventUpdate(mbUpdate);
-    xPropSet->setPropertyValue("LineStyle", css::uno::makeAny(rItem.GetValue()));
+    xPropSet->setPropertyValue("LineStyle", css::uno::Any(rItem.GetValue()));
 }
 
 void ChartLinePanel::setLineDash(const XLineDashItem& rItem)
@@ -273,7 +273,7 @@ void ChartLinePanel::setLineDash(const XLineDashItem& rItem)
             css::uno::Reference<css::lang::XMultiServiceFactory>(mxModel, css::uno::UNO_QUERY),
             "");
     xPropSet->setPropertyValue("LineDash", aAny);
-    xPropSet->setPropertyValue("LineDashName", css::uno::makeAny(aDashName));
+    xPropSet->setPropertyValue("LineDashName", css::uno::Any(aDashName));
 }
 
 void ChartLinePanel::setLineEndStyle(const XLineEndItem* /*pItem*/)
@@ -294,7 +294,7 @@ void ChartLinePanel::setLineJoint(const XLineJointItem* pItem)
 
     PreventUpdate aPreventUpdate(mbUpdate);
     if (pItem)
-        xPropSet->setPropertyValue("LineJoint", css::uno::makeAny(pItem->GetValue()));
+        xPropSet->setPropertyValue("LineJoint", css::uno::Any(pItem->GetValue()));
 }
 
 void ChartLinePanel::setLineCap(const XLineCapItem* /*pItem*/)
@@ -310,7 +310,7 @@ void ChartLinePanel::setLineTransparency(const XLineTransparenceItem& rItem)
         return;
 
     PreventUpdate aPreventUpdate(mbUpdate);
-    xPropSet->setPropertyValue("LineTransparence", css::uno::makeAny(rItem.GetValue()));
+    xPropSet->setPropertyValue("LineTransparence", css::uno::Any(rItem.GetValue()));
 }
 
 void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem)
@@ -322,7 +322,7 @@ void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem)
         return;
 
     PreventUpdate aPreventUpdate(mbUpdate);
-    xPropSet->setPropertyValue("LineWidth", css::uno::makeAny(rItem.GetValue()));
+    xPropSet->setPropertyValue("LineWidth", css::uno::Any(rItem.GetValue()));
 }
 
 } }
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index f8832e0ba061..6e48a4688e7f 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -137,7 +137,7 @@ void setDataLabelPlacement(const css::uno::Reference<css::frame::XModel>& xModel
         }
     }
 
-    xSeries->setPropertyValue("LabelPlacement", css::uno::makeAny(nApi));
+    xSeries->setPropertyValue("LabelPlacement", css::uno::Any(nApi));
 }
 
 bool isTrendlineVisible(const css::uno::Reference<css::frame::XModel>& xModel,
@@ -231,7 +231,7 @@ void setAttachedAxisType(const css::uno::Reference<css::frame::XModel>&
         return;
 
     sal_Int32 nIndex = bPrimary ? 0 : 1;
-    xSeries->setPropertyValue("AttachedAxisIndex", css::uno::makeAny(nIndex));
+    xSeries->setPropertyValue("AttachedAxisIndex", css::uno::Any(nIndex));
 }
 
 css::uno::Reference<css::chart2::XChartType> getChartType(
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index 565778777f1c..4be22de5d6e9 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -109,7 +109,7 @@ void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key,
 template< typename Value >
     void setPropertyValue( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value )
 {
-    setPropertyValueAny( rOutMap, key, css::uno::makeAny( value ));
+    setPropertyValueAny( rOutMap, key, css::uno::Any( value ));
 }
 
 template<>
@@ -123,7 +123,7 @@ OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rO
 template< typename Value >
     void setPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value )
 {
-    setPropertyValueDefaultAny( rOutMap, key, css::uno::makeAny( value ));
+    setPropertyValueDefaultAny( rOutMap, key, css::uno::Any( value ));
 }
 
 /** Calls setPropertyValue() but asserts that the given property hasn't been set
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 11e1a6bc57a0..8ea6da924081 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -115,7 +115,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
              ! ( xProp->getPropertyValue( "MediaType") >>= aMediaType ) ||
              ( aMediaType.isEmpty() ))
         {
-            xProp->setPropertyValue( "MediaType", uno::makeAny( _sMediaType ));
+            xProp->setPropertyValue( "MediaType", uno::Any( _sMediaType ));
         }
     }
     catch (const uno::Exception& ex)
@@ -352,10 +352,10 @@ sal_Int32 XMLFilter::impl_Import(
         // needed for relative URLs, but in clipboard copy/paste there may be none
         SAL_INFO_IF(aBaseUri.isEmpty(), "chart2", "chart::XMLFilter: no base URL");
         if( !aBaseUri.isEmpty() )
-            xImportInfo->setPropertyValue( "BaseURI", uno::makeAny( aBaseUri ) );
+            xImportInfo->setPropertyValue( "BaseURI", uno::Any( aBaseUri ) );
 
         if( !aHierarchName.isEmpty() )
-            xImportInfo->setPropertyValue( "StreamRelPath", uno::makeAny( aHierarchName ) );
+            xImportInfo->setPropertyValue( "StreamRelPath", uno::Any( aHierarchName ) );
 
         // import meta information
         if( bOasis )
@@ -418,7 +418,7 @@ sal_Int32 XMLFilter::impl_ImportStream(
         return 0;
 
     if( xImportInfo.is() )
-        xImportInfo->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) );
+        xImportInfo->setPropertyValue( "StreamName", uno::Any( rStreamName ) );
 
     if( xStorage.is() &&
         xStorage->isStreamElement( rStreamName ) )
@@ -595,9 +595,9 @@ sal_Int32 XMLFilter::impl_Export(
         SvtSaveOptions aSaveOpt;
         OUString sUsePrettyPrinting( "UsePrettyPrinting" );
         bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-        xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
+        xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::Any( bUsePrettyPrinting ) );
         if( ! bOasis )
-            xInfoSet->setPropertyValue( "ExportTableNumberList", uno::makeAny( true ));
+            xInfoSet->setPropertyValue( "ExportTableNumberList", uno::Any( true ));
 
         sal_Int32 nArgs = 2;
         if( xGraphicObjectResolver.is())
@@ -685,9 +685,9 @@ sal_Int32 XMLFilter::impl_ExportStream(
         uno::Reference< beans::XPropertySet > xStreamProp( xOutputStream, uno::UNO_QUERY );
         if(xStreamProp.is()) try
         {
-            xStreamProp->setPropertyValue( "MediaType", uno::makeAny( OUString("text/xml") ) );
-            xStreamProp->setPropertyValue( "Compressed", uno::makeAny( true ) );//@todo?
-            xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+            xStreamProp->setPropertyValue( "MediaType", uno::Any( OUString("text/xml") ) );
+            xStreamProp->setPropertyValue( "Compressed", uno::Any( true ) );//@todo?
+            xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::Any( true ) );
         }
         catch (const uno::Exception& rEx)
         {
@@ -703,7 +703,7 @@ sal_Int32 XMLFilter::impl_ExportStream(
                 rFilterProperties.getConstArray()[0] >>= xInfoSet;
             OSL_ENSURE( xInfoSet.is(), "missing infoset for export" );
             if( xInfoSet.is() )
-                xInfoSet->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) );
+                xInfoSet->setPropertyValue( "StreamName", uno::Any( rStreamName ) );
         }
 
         Reference< XExporter > xExporter( xServiceFactory->createInstanceWithArguments(
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index b4ab8bd6389e..140998b0057a 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -350,7 +350,7 @@ Axis::Axis( Reference< uno::XComponentContext > const & /* xContext */ ) :
 {
     osl_atomic_increment(&m_refCount);
     setFastPropertyValue_NoBroadcast(
-        ::chart::LinePropertiesHelper::PROP_LINE_COLOR, uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) );  // gray30
+        ::chart::LinePropertiesHelper::PROP_LINE_COLOR, uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) );  // gray30
 
     if( m_xGrid.is())
         ModifyListenerHelper::addListener( m_xGrid, m_xModifyEventForwarder );
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 04babbc036dd..5b4e7c395d86 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -148,9 +148,9 @@ BaseCoordinateSystem::BaseCoordinateSystem(
 
     m_aOrigin.realloc( m_nDimensionCount );
     for( sal_Int32 i = 0; i < m_nDimensionCount; ++i )
-        m_aOrigin[ i ] = uno::makeAny( double( 0.0 ) );
+        m_aOrigin[ i ] = uno::Any( double( 0.0 ) );
 
-    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::makeAny( false ));
+    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::Any( false ));
 }
 
 // explicit
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index dadecb76a516..f7a19f16bf86 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -732,7 +732,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             //init internal dataprovider
             {
                 uno::Sequence< uno::Any > aArgs(1);
-                beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(true) );
+                beans::NamedValue aParam( "CreateDefaultData" ,uno::Any(true) );
                 aArgs[0] <<= aParam;
                 xIni->initialize(aArgs);
             }
@@ -740,21 +740,21 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             uno::Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
                 "CellRangeRepresentation", -1,
-                uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE );
+                uno::Any( OUString("all") ), beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
                 "HasCategories",
                 -1,
-                uno::makeAny( true ),
+                uno::Any( true ),
                 beans::PropertyState_DIRECT_VALUE );
             aArgs[2] = beans::PropertyValue(
                 "FirstCellAsLabel",
                 -1,
-                uno::makeAny( true ),
+                uno::Any( true ),
                 beans::PropertyState_DIRECT_VALUE );
             aArgs[3] = beans::PropertyValue(
                 "DataRowSource",
                 -1,
-                uno::makeAny( css::chart::ChartDataRowSource_COLUMNS ),
+                uno::Any( css::chart::ChartDataRowSource_COLUMNS ),
                 beans::PropertyState_DIRECT_VALUE );
             xDataSource = m_xInternalDataProvider->createDataSource( aArgs );
         }
@@ -802,7 +802,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
             try
             {
                 bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) );
-                xProp->setPropertyValue("IncludeHiddenCells", uno::makeAny(bIncludeHiddenCells));
+                xProp->setPropertyValue("IncludeHiddenCells", uno::Any(bIncludeHiddenCells));
             }
             catch (const beans::UnknownPropertyException&)
             {
@@ -1317,7 +1317,7 @@ void ChartModel::setTimeBased(bool bTimeBased)
         if(xTimeBased.is())
         {
             uno::Reference< beans::XPropertySet > xPropSet(xTimeBased, uno::UNO_QUERY_THROW);
-            xPropSet->setPropertyValue("TimeBased", uno::makeAny(bTimeBased));
+            xPropSet->setPropertyValue("TimeBased", uno::Any(bTimeBased));
         }
     }
 }
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index bba125948d3a..7ad28cbcc927 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -98,7 +98,7 @@ void lcl_addStorageToMediaDescriptor(
 {
     rOutMD.realloc( rOutMD.getLength() + 1 );
     rOutMD[rOutMD.getLength() - 1] = beans::PropertyValue(
-        "Storage", -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE );
+        "Storage", -1, uno::Any( xStorage ), beans::PropertyState_DIRECT_VALUE );
 }
 
 Reference< embed::XStorage > lcl_createStorage(
@@ -364,7 +364,7 @@ void ChartModel::impl_store(
         {
             xPropSet->setPropertyValue(
                 "SavedObject",
-                uno::makeAny( aMDHelper.HierarchicalDocumentName ) );
+                uno::Any( aMDHelper.HierarchicalDocumentName ) );
         }
         catch ( const uno::Exception& )
         {
@@ -391,7 +391,7 @@ void ChartModel::insertDefaultChart()
                 if( bSupportsCategories )
                 {
                     aParam.realloc( 1 );
-                    aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ),
+                    aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::Any( true ),
                                                       beans::PropertyState_DIRECT_VALUE );
                 }
 
@@ -411,13 +411,13 @@ void ChartModel::insertDefaultChart()
                 Reference< beans::XPropertySet > xLegendProperties( xLegend, uno::UNO_QUERY );
                 if( xLegendProperties.is() )
                 {
-                    xLegendProperties->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ));
-                    xLegendProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ));
-                    xLegendProperties->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
-                    xLegendProperties->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
+                    xLegendProperties->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE ));
+                    xLegendProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ));
+                    xLegendProperties->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
+                    xLegendProperties->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
 
                     if( bIsRTL )
-                        xLegendProperties->setPropertyValue( "AnchorPosition", uno::makeAny( chart2::LegendPosition_LINE_START ));
+                        xLegendProperties->setPropertyValue( "AnchorPosition", uno::Any( chart2::LegendPosition_LINE_START ));
                 }
                 if(xDiagram.is())
                     xDiagram->setLegend( xLegend );
@@ -426,8 +426,8 @@ void ChartModel::insertDefaultChart()
                 Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY );
                 if( xDiagramProperties.is() )
                 {
-                    xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( true ));
-                    xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL ));
+                    xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::Any( true ));
+                    xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::Any( drawing::ProjectionMode_PARALLEL ));
                     ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
                 }
 
@@ -437,18 +437,18 @@ void ChartModel::insertDefaultChart()
                     Reference< beans::XPropertySet > xWall( xDiagram->getWall() );
                     if( xWall.is() )
                     {
-                        xWall->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
-                        xWall->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ) );
-                        xWall->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
-                        xWall->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
+                        xWall->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
+                        xWall->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE ) );
+                        xWall->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
+                        xWall->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
                     }
                     Reference< beans::XPropertySet > xFloor( xDiagram->getFloor() );
                     if( xFloor.is() )
                     {
-                        xFloor->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
-                        xFloor->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) );
-                        xFloor->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
-                        xFloor->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20
+                        xFloor->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
+                        xFloor->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) );
+                        xFloor->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
+                        xFloor->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20
                     }
 
                 }
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 47508e5d05f5..12aea1fe3496 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -317,7 +317,7 @@ Diagram::Diagram( uno::Reference< uno::XComponentContext > const & xContext ) :
     // straight ono the scene).  These defaults have been acquired from the old
     // chart implementation.
     setFastPropertyValue_NoBroadcast(
-        SceneProperties::PROP_SCENE_CAMERA_GEOMETRY, uno::makeAny(
+        SceneProperties::PROP_SCENE_CAMERA_GEOMETRY, uno::Any(
             ThreeDHelper::getDefaultCameraGeometry()));
 }
 
@@ -680,7 +680,7 @@ void SAL_CALL Diagram::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) co
     {
         sal_Int32 nPerspective = ::basegfx::fround( ThreeDHelper::CameraDistanceToPerspective(
             ThreeDHelper::getCameraDistance( const_cast< Diagram* >( this ) ) ) );
-        rValue = uno::makeAny(nPerspective);
+        rValue = uno::Any(nPerspective);
     }
     else if( PROP_DIAGRAM_ROTATION_HORIZONTAL == nHandle
         || PROP_DIAGRAM_ROTATION_VERTICAL == nHandle )
@@ -692,7 +692,7 @@ void SAL_CALL Diagram::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) co
             nAngleDegree = nHorizontal;
         else
             nAngleDegree = nVertical;
-        rValue = uno::makeAny(nAngleDegree);
+        rValue = uno::Any(nAngleDegree);
     }
     else
         ::property::OPropertySet::getFastPropertyValue( rValue,nHandle );
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 480cc29a41d0..a66243b847cd 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -118,10 +118,10 @@ StockBar::StockBar( bool bRisingCourse ) :
     {
         setFastPropertyValue_NoBroadcast(
             ::chart::FillProperties::PROP_FILL_COLOR,
-            uno::makeAny( sal_Int32( 0x000000 ))); // black
+            uno::Any( sal_Int32( 0x000000 ))); // black
         setFastPropertyValue_NoBroadcast(
             ::chart::LinePropertiesHelper::PROP_LINE_COLOR,
-            uno::makeAny( sal_Int32( 0xb3b3b3 ))); // gray30
+            uno::Any( sal_Int32( 0xb3b3b3 ))); // gray30
     }
 }
 
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 3353d0d752f7..abe4f805d69d 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -122,7 +122,7 @@ AreaChartTypeTemplate::AreaChartTypeTemplate(
         ::property::OPropertySet( m_aMutex ),
         m_eStackMode( eStackMode )
 {
-    setFastPropertyValue_NoBroadcast( PROP_AREA_TEMPLATE_DIMENSION, uno::makeAny( nDim ));
+    setFastPropertyValue_NoBroadcast( PROP_AREA_TEMPLATE_DIMENSION, uno::Any( nDim ));
 }
 
 AreaChartTypeTemplate::~AreaChartTypeTemplate()
@@ -179,7 +179,7 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle(
     ::sal_Int32 nSeriesCount )
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
-    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
 }
 
 void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram )
@@ -187,7 +187,7 @@ void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiag
     ChartTypeTemplate::resetStyles( xDiagram );
     ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
-    uno::Any aLineStyleAny( uno::makeAny( drawing::LineStyle_NONE ));
+    uno::Any aLineStyleAny( drawing::LineStyle_NONE );
     for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
          aIt != aSeriesVec.end(); ++aIt )
     {
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index b06e7bb08746..a2943f81a633 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -189,7 +189,7 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
         if( !bGeomAmbiguous )
         {
             setFastPropertyValue_NoBroadcast(
-                PROP_BAR_TEMPLATE_GEOMETRY3D, uno::makeAny( aCommonGeom ));
+                PROP_BAR_TEMPLATE_GEOMETRY3D, uno::Any( aCommonGeom ));
         }
     }
 
@@ -250,7 +250,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
     ::sal_Int32 nSeriesCount )
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
-    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
     if( getDimension() == 3 )
     {
         try
@@ -273,7 +273,7 @@ void SAL_CALL BarChartTypeTemplate::resetStyles(
     ChartTypeTemplate::resetStyles( xDiagram );
     ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
-    uno::Any aLineStyleAny( uno::makeAny( drawing::LineStyle_NONE ));
+    uno::Any aLineStyleAny( drawing::LineStyle_NONE );
     for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
          aIt != aSeriesVec.end(); ++aIt )
     {
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 78a297305aa1..39a33f1a8908 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -147,7 +147,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle(
     ::sal_Int32 nSeriesCount )
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
-    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+    DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
 }
 
 // ____ XChartTypeTemplate ____
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 22c74c5ff7ea..4e0d14f3b540 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -159,9 +159,9 @@ CandleStickChartType::CandleStickChartType(
     ModifyListenerHelper::addListener( xBlackDayProps, m_xModifyEventForwarder );
 
     setFastPropertyValue_NoBroadcast(
-        PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, uno::makeAny( xWhiteDayProps ));
+        PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, uno::Any( xWhiteDayProps ));
     setFastPropertyValue_NoBroadcast(
-        PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, uno::makeAny( xBlackDayProps ));
+        PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, uno::Any( xBlackDayProps ));
 }
 
 CandleStickChartType::CandleStickChartType( const CandleStickChartType & rOther ) :
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index da1cfefda6bf..d62068c9afac 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -64,7 +64,7 @@ void lcl_applyDefaultStyle(
         if( xSeriesProp.is() && xColorScheme.is() )
             xSeriesProp->setPropertyValue(
                 "Color",
-                uno::makeAny( xColorScheme->getColorByIndex( nIndex )));
+                uno::Any( xColorScheme->getColorByIndex( nIndex )));
     }
 }
 
@@ -113,7 +113,7 @@ void lcl_ensureCorrectMissingValueTreatment( const Reference< chart2::XDiagram >
             ::chart::ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) );
 
         if( aAvailableMissingValueTreatment.getLength() )
-            xDiaProp->setPropertyValue( "MissingValueTreatment", uno::makeAny( aAvailableMissingValueTreatment[0] ) );
+            xDiaProp->setPropertyValue( "MissingValueTreatment", uno::Any( aAvailableMissingValueTreatment[0] ) );
         else
             xDiaProp->setPropertyValue( "MissingValueTreatment", uno::Any() );
     }
@@ -214,7 +214,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
             if( aData.Categories.is())
             {
                 aParam.realloc( 1 );
-                aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ),
+                aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::Any( true ),
                                                   beans::PropertyState_DIRECT_VALUE );
             }
             aData = xInterpreter->interpretDataSource( xSource, aParam, aFlatSeriesSeq );
@@ -388,7 +388,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
         try
         {
             StackMode eStackMode = getStackMode( nChartTypeIndex );
-            const uno::Any aPropValue = uno::makeAny(
+            const uno::Any aPropValue = uno::Any(
                 ( (eStackMode == StackMode_Y_STACKED) ||
                   (eStackMode == StackMode_Y_STACKED_PERCENT) )
                 ? chart2::StackingDirection_Y_STACKING
@@ -447,7 +447,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
                 if( xAxisProp.is())
                 {
                     // set number format to source format
-                    xAxisProp->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::makeAny(true));
+                    xAxisProp->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::Any(true));
                     xAxisProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any());
                 }
             }
@@ -745,7 +745,7 @@ void ChartTypeTemplate::adaptAxes(
                             if( xAxisProp.is())
                             {
                                 // set number format to source format
-                                xAxisProp->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::makeAny(true));
+                                xAxisProp->setPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT, uno::Any(true));
                                 xAxisProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any());
                             }
                         }
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 9809cd0f0845..4ca7024bd139 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -127,7 +127,7 @@ ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(
         ::property::OPropertySet( m_aMutex ),
         m_eStackMode( eStackMode )
 {
-    setFastPropertyValue_NoBroadcast( PROP_COL_LINE_NUMBER_OF_LINES, uno::makeAny( nNumberOfLines ));
+    setFastPropertyValue_NoBroadcast( PROP_COL_LINE_NUMBER_OF_LINES, uno::Any( nNumberOfLines ));
 }
 
 ColumnLineChartTypeTemplate::~ColumnLineChartTypeTemplate()
@@ -242,7 +242,7 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle(
 
     if( nChartTypeIndex==0 ) // columns
     {
-        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
     }
     else if( nChartTypeIndex==1 ) // lines
     {
@@ -332,7 +332,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
                     if( xSeriesContainer.is() )
                     {
                         sal_Int32 nNumberOfLines = xSeriesContainer->getDataSeries().getLength();
-                        setFastPropertyValue_NoBroadcast( PROP_COL_LINE_NUMBER_OF_LINES, uno::makeAny( nNumberOfLines ));
+                        setFastPropertyValue_NoBroadcast( PROP_COL_LINE_NUMBER_OF_LINES, uno::Any( nNumberOfLines ));
                     }
                 }
             }
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index d3e7c85f5352..57f03562e85d 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -330,7 +330,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co
     try
     {
         Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
-        xProp->setPropertyValue( "Role", uno::makeAny( rRole ));
+        xProp->setPropertyValue( "Role", uno::Any( rRole ));
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index c8cf9b490efa..ed5ba7807abf 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -156,7 +156,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref
             new GL3DBarChartType(GetComponentContext()));
         bool bVal = false;
         getFastPropertyValue(PROP_GL3DCHARTTYPE_ROUNDED_EDGE) >>= bVal;
-        chart->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(bVal));
+        chart->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(bVal));
         xResult = chart.get();
     }
     catch (const uno::Exception & ex)
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 0144b54a6924..15a27541bedb 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -160,9 +160,9 @@ PieChartTypeTemplate::PieChartTypeTemplate(
         ChartTypeTemplate( xContext, rServiceName ),
         ::property::OPropertySet( m_aMutex )
 {
-    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_OFFSET_MODE,    uno::makeAny( eMode ));
-    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION,      uno::makeAny( nDim ));
-    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS,      uno::makeAny( bRings ));
+    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_OFFSET_MODE,    uno::Any( eMode ));
+    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION,      uno::Any( nDim ));
+    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS,      uno::Any( bRings ));
 }
 
 PieChartTypeTemplate::~PieChartTypeTemplate()
@@ -359,7 +359,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
             {
                 eOffsetMode = chart2::PieChartOffsetMode_ALL_EXPLODED;
                 if( bAdaptProperties )
-                    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DEFAULT_OFFSET, uno::makeAny( fOffset ));
+                    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DEFAULT_OFFSET, uno::Any( fOffset ));
             }
 
             bResult = ( eOffsetMode == ePieOffsetMode );
@@ -505,7 +505,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
             if( bSetOffset )
             {
                 // set the offset to the series and to the attributed data points
-                xProp->setPropertyValue( aOffsetPropName, uno::makeAny( fOffsetToSet ));
+                xProp->setPropertyValue( aOffsetPropName, uno::Any( fOffsetToSet ));
 
                 // remove hard attributes from data points
                 for( sal_Int32 nPtIdx=0; nPtIdx<aAttributedDataPointIndexList.getLength(); ++nPtIdx )
@@ -519,10 +519,10 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
         }
 
         // line style
-        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
 
         // vary colors by point
-        xProp->setPropertyValue( "VaryColorsByPoint", uno::makeAny( true ));
+        xProp->setPropertyValue( "VaryColorsByPoint", uno::Any( true ));
     }
     catch( const uno::Exception & ex )
     {
@@ -574,7 +574,7 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr
     // line style
     ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
-    uno::Any aLineStyleAny( uno::makeAny( drawing::LineStyle_NONE ));
+    uno::Any aLineStyleAny( drawing::LineStyle_NONE );
     for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
          aIt != aSeriesVec.end(); ++aIt )
     {
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 922dfb90f26f..be1f3ec99472 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -149,13 +149,13 @@ ScatterChartType::ScatterChartType(
 {
     if( eCurveStyle != chart2::CurveStyle_LINES )
         setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_CURVE_STYLE,
-                                          uno::makeAny( eCurveStyle ));
+                                          uno::Any( eCurveStyle ));
     if( nResolution != 20 )
         setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION,
-                                          uno::makeAny( nResolution ));
+                                          uno::Any( nResolution ));
     if( nOrder != 3 )
         setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_SPLINE_ORDER,
-                                          uno::makeAny( nOrder ));
+                                          uno::Any( nOrder ));
 }
 
 ScatterChartType::ScatterChartType( const ScatterChartType & rOther ) :
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index bde601008446..ea5c553637f5 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -212,7 +212,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
         DataSeriesHelper::switchLinesOnOrOff( xProp, m_bHasLines );
         DataSeriesHelper::makeLinesThickOrThin( xProp, m_nDim==2 );
         if( m_nDim==3 )
-            DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+            DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 3b58a76aa969..d453fec3cf51 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -163,15 +163,15 @@ StockChartTypeTemplate::StockChartTypeTemplate(
 {
     setFastPropertyValue_NoBroadcast(
         PROP_STOCKCHARTTYPE_TEMPLATE_OPEN,
-        uno::makeAny( ( eVariant == OPEN_LOW_HI_CLOSE ||
+        uno::Any( ( eVariant == OPEN_LOW_HI_CLOSE ||
                         eVariant == VOL_OPEN_LOW_HI_CLOSE )));
     setFastPropertyValue_NoBroadcast(
         PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME,
-        uno::makeAny( ( eVariant == VOL_LOW_HI_CLOSE ||
+        uno::Any( ( eVariant == VOL_LOW_HI_CLOSE ||
                         eVariant == VOL_OPEN_LOW_HI_CLOSE )));
     setFastPropertyValue_NoBroadcast(
         PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE,
-        uno::makeAny( bJapaneseStyle ));
+        uno::Any( bJapaneseStyle ));
 }
 
 StockChartTypeTemplate::~StockChartTypeTemplate()
@@ -234,12 +234,12 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
 
         Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY );
         if( xProp.is() )
-            xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) );
+            xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) );
 
         if( bHasVolume && nChartTypeIndex==0 )
         {
             //switch lines off for volume bars
-            DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+            DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
         }
         else
         {
@@ -249,7 +249,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
                 drawing::LineStyle eStyle = drawing::LineStyle_NONE;
                 xProp->getPropertyValue( "LineStyle" ) >>= eStyle;
                 if( eStyle == drawing::LineStyle_NONE )
-                    xProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ));
+                    xProp->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ));
             }
         }
 
@@ -273,7 +273,7 @@ void SAL_CALL StockChartTypeTemplate::resetStyles(
         {
             Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( sal_Int32(0) ) );
+                xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( sal_Int32(0) ) );
         }
     }
 
@@ -360,9 +360,9 @@ void StockChartTypeTemplate::createChartTypes(
         Reference< beans::XPropertySet > xCTProp( xCT, uno::UNO_QUERY );
         if( xCTProp.is())
         {
-            xCTProp->setPropertyValue( "Japanese", uno::makeAny( bJapaneseStyle ));
-            xCTProp->setPropertyValue( "ShowFirst", uno::makeAny( bShowFirst ));
-            xCTProp->setPropertyValue( "ShowHighLow", uno::makeAny( bShowHighLow ));
+            xCTProp->setPropertyValue( "Japanese", uno::Any( bJapaneseStyle ));
+            xCTProp->setPropertyValue( "ShowFirst", uno::Any( bShowFirst ));
+            xCTProp->setPropertyValue( "ShowHighLow", uno::Any( bShowHighLow ));
         }
 
         if( aSeriesSeq.getLength() > nSeriesIndex &&
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 1fb25ad426ab..6c7215269bd3 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -330,7 +330,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
         }
 
         if (nOldNumberFormat != nNumberFormatKey)
-            xProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(nNumberFormatKey));
+            xProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(nNumberFormatKey));
     }
 
     return nNumberFormatKey;
@@ -386,7 +386,7 @@ Reference< XAxis > AxisHelper::createAxis(
 
             Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue("CrossoverPosition", uno::makeAny(eNewAxisPos) );
+                xProp->setPropertyValue("CrossoverPosition", uno::Any(eNewAxisPos) );
         }
 
         Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
@@ -478,9 +478,9 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( true ) );
+        xProps->setPropertyValue( "Show", uno::Any( true ) );
         LinePropertiesHelper::SetLineVisible( xProps );
-        xProps->setPropertyValue( "DisplayLabels", uno::makeAny( true ) );
+        xProps->setPropertyValue( "DisplayLabels", uno::Any( true ) );
     }
 }
 
@@ -488,7 +488,7 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( true ) );
+        xGridProperties->setPropertyValue( "Show", uno::Any( true ) );
         LinePropertiesHelper::SetLineVisible( xGridProperties );
     }
 }
@@ -504,7 +504,7 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( false ) );
+        xProps->setPropertyValue( "Show", uno::Any( false ) );
     }
 }
 
@@ -555,7 +555,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( false ) );
+        xGridProperties->setPropertyValue( "Show", uno::Any( false ) );
     }
 }
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index d33f5f9fccf4..a8314b62d801 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -237,7 +237,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod
 
             //set the property on all instances in all cases to get the different objects in sync!
 
-            uno::Any aNewValue = uno::makeAny(bIncludeHiddenCells);
+            uno::Any aNewValue(bIncludeHiddenCells);
 
             try
             {
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 830f229c02dd..c3b2da5d64aa 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -155,7 +155,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
                 aLabelAtSeries.ShowNumberInPercent = false;
                 aLabelAtSeries.ShowCategoryName = false;
             }
-            xSeriesProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabelAtSeries));
+            xSeriesProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabelAtSeries));
             uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
             if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
             {
@@ -172,7 +172,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
                             aLabel.ShowNumberInPercent = false;
                             aLabel.ShowCategoryName = false;
                         }
-                        xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+                        xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
                     }
                 }
             }
@@ -390,7 +390,7 @@ void setStackModeAtSeries(
     if( eStackMode == StackMode_AMBIGUOUS )
         return;
 
-    const uno::Any aPropValue = uno::makeAny(
+    const uno::Any aPropValue(
         ( (eStackMode == StackMode_Y_STACKED) ||
           (eStackMode == StackMode_Y_STACKED_PERCENT) )
         ? chart2::StackingDirection_Y_STACKING
@@ -554,7 +554,7 @@ void switchSymbolsOnOrOff( const Reference< beans::XPropertySet > & xSeriesPrope
             aSymbProp.Style = chart2::SymbolStyle_STANDARD;
             aSymbProp.StandardSymbol = nSeriesIndex;
         }
-        xSeriesProperties->setPropertyValue( "Symbol", uno::makeAny( aSymbProp ));
+        xSeriesProperties->setPropertyValue( "Symbol", uno::Any( aSymbProp ));
     }
     //todo: check attributed data points
 }
@@ -571,11 +571,11 @@ void switchLinesOnOrOff( const Reference< beans::XPropertySet > & xSeriesPropert
         if( (xSeriesProperties->getPropertyValue( "LineStyle") >>= eLineStyle ) &&
             eLineStyle == drawing::LineStyle_NONE )
         {
-            xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+            xSeriesProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
         }
     }
     else
-        xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+        xSeriesProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
 }
 
 void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesProperties, bool bThick )
@@ -589,7 +589,7 @@ void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesPrope
         nOldValue != nNewValue )
     {
         if( !(bThick && nOldValue>0))
-            xSeriesProperties->setPropertyValue( "LineWidth", uno::makeAny( nNewValue ) );
+            xSeriesProperties->setPropertyValue( "LineWidth", uno::Any( nNewValue ) );
     }
 }
 
@@ -863,7 +863,7 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp
             DataPointLabel aLabel;
             xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
             aLabel.ShowNumber = true;
-            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
         }
     }
     catch(const uno::Exception &e)
@@ -883,7 +883,7 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
             aLabel.ShowNumber = false;
             aLabel.ShowNumberInPercent = false;
             aLabel.ShowCategoryName = false;
-            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
         }
     }
     catch(const uno::Exception &e)
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index d75ad20ce3bf..7ddfd660ec9b 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -159,13 +159,13 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
 
     uno::Sequence< beans::PropertyValue > aArguments(3);
     aArguments[0] = beans::PropertyValue( "DataRowSource"
-        , -1, uno::makeAny( eRowSource )
+        , -1, uno::Any( eRowSource )
         , beans::PropertyState_DIRECT_VALUE );
     aArguments[1] = beans::PropertyValue( "FirstCellAsLabel"
-        , -1, uno::makeAny( bFirstCellAsLabel )
+        , -1, uno::Any( bFirstCellAsLabel )
         , beans::PropertyState_DIRECT_VALUE );
     aArguments[2] = beans::PropertyValue( "HasCategories"
-        , -1, uno::makeAny( bHasCategories )
+        , -1, uno::Any( bHasCategories )
         , beans::PropertyState_DIRECT_VALUE );
 
     return aArguments;
@@ -180,14 +180,14 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
     aArguments.realloc( aArguments.getLength() + 1 );
     aArguments[aArguments.getLength() - 1] =
         beans::PropertyValue( "CellRangeRepresentation"
-                              , -1, uno::makeAny( rRangeRepresentation )
+                              , -1, uno::Any( rRangeRepresentation )
                               , beans::PropertyState_DIRECT_VALUE );
     if( rSequenceMapping.getLength() )
     {
         aArguments.realloc( aArguments.getLength() + 1 );
         aArguments[aArguments.getLength() - 1] =
             beans::PropertyValue( "SequenceMapping"
-                                , -1, uno::makeAny( rSequenceMapping )
+                                , -1, uno::Any( rSequenceMapping )
                                 , beans::PropertyState_DIRECT_VALUE );
     }
     return aArguments;
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index ac19d718f1f9..54e1b52ecf93 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -177,7 +177,7 @@ void DiagramHelper::setVertical(
                     else if( bVertical && nDimIndex == 0 )
                         fNewAngleDegree = 90.0;
 
-                    xTitleProps->setPropertyValue("TextRotation", uno::makeAny(fNewAngleDegree));
+                    xTitleProps->setPropertyValue("TextRotation", uno::Any(fNewAngleDegree));
                 }
             }
         }
@@ -248,7 +248,7 @@ void DiagramHelper::setStackMode(
         else if( eStackMode == StackMode_Z_STACKED )
             eNewDirection = StackingDirection_Z_STACKING;
 
-        uno::Any aNewDirection( uno::makeAny(eNewDirection) );
+        uno::Any aNewDirection( eNewDirection );
 
         bool bPercent = false;
         if( eStackMode == StackMode_Y_STACKED_PERCENT )
@@ -593,7 +593,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
     {
         try
         {
-            xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) );
+            xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) );
             bChanged = true;
         }
         catch( const uno::Exception & ex )
@@ -915,7 +915,7 @@ Reference< data::XLabeledDataSequence >
                     {
                         try
                         {
-                            xProp->setPropertyValue( "Role", uno::makeAny( OUString("categories") ) );
+                            xProp->setPropertyValue( "Role", uno::Any( OUString("categories") ) );
                         }
                         catch( const uno::Exception & ex )
                         {
@@ -1021,7 +1021,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                     Any& rAny = rCat[0];
                     if( !(rAny>>=fTest) )
                     {
-                        rAny = uno::makeAny(fNan);
+                        rAny <<= fNan;
                     }
                 }
             }
@@ -1058,7 +1058,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                     Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE,  rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate );
                     if( aKeySeq.getLength() )
                     {
-                        xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(aKeySeq[0]));
+                        xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(aKeySeq[0]));
                     }
                 }
             }
@@ -1557,7 +1557,7 @@ void DiagramHelper::setGeometry3D(
              aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
     {
         DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(
-            *aIt, "Geometry3D", uno::makeAny( nNewGeometry ));
+            *aIt, "Geometry3D", uno::Any( nNewGeometry ));
     }
 }
 
@@ -1653,8 +1653,8 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >
     if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 )
         aNewPos.Secondary = 1.0 - aNewSize.Secondary;
 
-    xDiaProps->setPropertyValue( "RelativePosition", uno::makeAny(aNewPos) );
-    xDiaProps->setPropertyValue( "RelativeSize", uno::makeAny(aNewSize) );
+    xDiaProps->setPropertyValue( "RelativePosition", uno::Any(aNewPos) );
+    xDiaProps->setPropertyValue( "RelativeSize", uno::Any(aNewSize) );
 
     bChanged = (aOldPos.Anchor!=aNewPos.Anchor) ||
         (aOldPos.Primary!=aNewPos.Primary) ||
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index d717d09dca98..f7645da040cb 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -275,7 +275,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
     else if(rPropName == "LineWidth")
         aRet <<= mnLineWidth;
     else if(rPropName == "LineStyle")
-        aRet = uno::makeAny(meLineStyle);
+        aRet <<= meLineStyle;
     else if(rPropName == "LineColor")
         aRet <<= maLineColor;
     else if(rPropName == "LineTransparence")
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index b6cb49fefb34..da87d33a430f 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -55,7 +55,7 @@ struct lcl_NumberedStringGenerator
     vector< uno::Any > operator()()
     {
         vector< uno::Any > aRet(1);
-        aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter )) );
+        aRet[0] <<= m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter ));
         return aRet;
     }
 private:
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index f14810a9e64b..0101867ddbe3 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -251,7 +251,7 @@ public:
         vector< uno::Any > aRet( rVector );
         if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
             aRet.resize( m_nLevel+1 );
-        aRet[ m_nLevel ]=uno::makeAny(rNewValue);
+        aRet[ m_nLevel ] <<= rNewValue;
         return aRet;
     }
 
@@ -372,7 +372,7 @@ InternalDataProvider::InternalDataProvider(
                         for( sal_Int32 nN=0; nN<nLength; nN++)
                         {
                             vector< uno::Any > aVector(1);
-                            aVector[0] = uno::makeAny( aSimplecategories[nN] );
+                            aVector[0] <<= aSimplecategories[nN];
                             aNewCategories.push_back( aVector );
                         }
                     }
@@ -615,7 +615,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
 
         for (size_t i = 0; i < aRawElems.size(); ++i)
         {
-            std::vector<uno::Any> aLabels(1, uno::makeAny(aRawElems[i]));
+            std::vector<uno::Any> aLabels(1, uno::Any(aRawElems[i]));
             m_aInternalData.setComplexRowLabel(i, aLabels);
         }
 
@@ -629,7 +629,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
         sal_Int32 nColSize = m_aInternalData.getColumnCount();
         if (!aRawElems.empty() && nColSize)
         {
-            std::vector<uno::Any> aLabels(1, uno::makeAny(aRawElems[0]));
+            std::vector<uno::Any> aLabels(1, uno::Any(aRawElems[0]));
             m_aInternalData.setComplexColumnLabel(nColSize-1, aLabels);
 
             OUString aRangeRep = lcl_aLabelRangePrefix + OUString::number(nColSize-1);
@@ -769,19 +769,19 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
 {
     Sequence< beans::PropertyValue > aArguments( 4 );
     aArguments[0] = beans::PropertyValue(
-        "CellRangeRepresentation", -1, uno::makeAny( OUString(lcl_aCompleteRange) ),
+        "CellRangeRepresentation", -1, uno::Any( OUString(lcl_aCompleteRange) ),
         beans::PropertyState_DIRECT_VALUE );
     aArguments[1] = beans::PropertyValue(
-        "DataRowSource", -1, uno::makeAny(
+        "DataRowSource", -1, uno::Any(
             m_bDataInColumns
             ? css::chart::ChartDataRowSource_COLUMNS
             : css::chart::ChartDataRowSource_ROWS ),
         beans::PropertyState_DIRECT_VALUE );
     // internal data always contains labels and categories
     aArguments[2] = beans::PropertyValue(
-        "FirstCellAsLabel", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+        "FirstCellAsLabel", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE );
     aArguments[3] = beans::PropertyValue(
-        "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+        "HasCategories", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE );
 
     // #i85913# Sequence Mapping is not needed for internal data, as it is
     // applied to the data when the data source is created.
@@ -1374,7 +1374,7 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >&
 
     for(sal_Int32 nN=0; nN<nCount; ++nN )
     {
-        aSingleLabel[0]=uno::makeAny(rDates[nN]);
+        aSingleLabel[0] <<= rDates[nN];
         aNewCategories.push_back(aSingleLabel);
     }
 
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index ecfd84d8f395..2f1b58157db6 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -39,14 +39,14 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(true) );
+        xProp->setPropertyValue( "Show", uno::Any(true) );
 
         chart2::RelativePosition aRelativePosition;
         if( !(xProp->getPropertyValue( "RelativePosition") >>=  aRelativePosition) )
         {
             chart2::LegendPosition ePos = chart2::LegendPosition_LINE_END;
             if( !(xProp->getPropertyValue( "AnchorPosition") >>= ePos ) )
-                xProp->setPropertyValue( "AnchorPosition", uno::makeAny( ePos ));
+                xProp->setPropertyValue( "AnchorPosition", uno::Any( ePos ));
 
             css::chart::ChartLegendExpansion eExpansion =
                     ( ePos == chart2::LegendPosition_LINE_END ||
@@ -54,7 +54,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
                     ? css::chart::ChartLegendExpansion_HIGH
                     : css::chart::ChartLegendExpansion_WIDE;
             if( !(xProp->getPropertyValue( "Expansion") >>= eExpansion ) )
-                xProp->setPropertyValue( "Expansion", uno::makeAny( eExpansion ));
+                xProp->setPropertyValue( "Expansion", uno::Any( eExpansion ));
 
             xProp->setPropertyValue( "RelativePosition", uno::Any());
         }
@@ -69,7 +69,7 @@ void LegendHelper::hideLegend( ChartModel& rModel )
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(false) );
+        xProp->setPropertyValue( "Show", uno::Any(false) );
     }
 }
 
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index e5e29145a43a..6f53e7ead77d 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -135,12 +135,12 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference<
             drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
             xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
             if( aLineStyle == drawing::LineStyle_NONE )
-                xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+                xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
 
             sal_Int16 nLineTransparence=0;
             xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
             if(100==nLineTransparence)
-                xLineProperties->setPropertyValue( "LineTransparence", uno::makeAny( sal_Int16(0) ) );
+                xLineProperties->setPropertyValue( "LineTransparence", uno::Any( sal_Int16(0) ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -159,7 +159,7 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference<
             drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
             xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
             if( aLineStyle != drawing::LineStyle_NONE )
-                xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+                xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -175,7 +175,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference<
     {
         if( xLineProperties.is() )
         {
-            xLineProperties->setPropertyValue( "LineColor", uno::makeAny( nColor ) );
+            xLineProperties->setPropertyValue( "LineColor", uno::Any( nColor ) );
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 30a08c1ad283..dbf192bd6690 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -205,14 +205,14 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
             sal_Int32 n32Value = 0;
             if( rValue>>=n32Value )
             {
-                rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n32Value) );
+                rConvertedValue <<= static_cast<sal_Int16>(n32Value);
                 return true;
             }
 
             sal_Int64 n64Value = 0;
             if( rValue>>=n64Value )
             {
-                rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n64Value) );
+                rConvertedValue <<= static_cast<sal_Int16>(n64Value);
                 return true;
             }
         }
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9af4f05b171f..27b7394b7c6e 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1534,11 +1534,11 @@ Any ObjectIdentifier::getAny() const
     Any aAny;
     if ( isAutoGeneratedObject() )
     {
-        aAny = uno::makeAny( getObjectCID() );
+        aAny <<= getObjectCID();
     }
     else if ( isAdditionalShape() )
     {
-        aAny = uno::makeAny( getAdditionalShape() );
+        aAny <<= getAdditionalShape();
     }
     return aAny;
 }
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 134790941f4d..036699648163 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -144,7 +144,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
         if( useAutoScale())
         {
             if( ! bHasOldRefSize )
-                xProp->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ));
+                xProp->setPropertyValue( aRefSizeName, uno::Any( aRefSize ));
         }
         else
         {
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index abd80a3c8c7d..96b55ec76063 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -450,10 +450,10 @@ void RegressionCurveHelper::removeEquations(
                         uno::Reference< beans::XPropertySet > xEqProp( xRegCurve->getEquationProperties() ) ;
                         if( xEqProp.is())
                         {
-                            xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false ));
-                            xEqProp->setPropertyValue( "XName", uno::makeAny( OUString("x") ));
-                            xEqProp->setPropertyValue( "YName", uno::makeAny( OUString("f(x) ") ));
-                            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
+                            xEqProp->setPropertyValue( "ShowEquation", uno::Any( false ));
+                            xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") ));
+                            xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x) ") ));
+                            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false ));
                         }
                     }
                 }
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index bbfa82b2e689..136c687e8174 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -185,7 +185,7 @@ RegressionCurveModel::RegressionCurveModel( tCurveType eCurveType ) :
     // set 0 line width (default) hard, so that it is always written to XML,
     // because the old implementation uses different defaults
     setFastPropertyValue_NoBroadcast(
-        LinePropertiesHelper::PROP_LINE_WIDTH, uno::makeAny( sal_Int32( 0 )));
+        LinePropertiesHelper::PROP_LINE_WIDTH, uno::Any( sal_Int32( 0 )));
     ModifyListenerHelper::addListener( m_xEquationProperties, m_xModifyEventForwarder );
 }
 
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 02af7a865cb8..8c191dd18719 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Exception;
 
 namespace chart
@@ -73,7 +73,7 @@ void RelativeSizeHelper::adaptFontSizes(
             {
                 xTargetProperties->setPropertyValue(
                     *aIt,
-                    makeAny( static_cast< float >(
+                    Any( static_cast< float >(
                                  calculate( fFontHeight, rOldReferenceSize, rNewReferenceSize ))));
             }
         }
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index 49ed57513e41..a654b8dc01ea 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -340,7 +340,7 @@ void SceneProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_7, false );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_8, false );
 
-    uno::Any aDefaultLightDirection( uno::makeAny( drawing::Direction3D( 0.0, 0.0, 1.0 ) ) );
+    uno::Any aDefaultLightDirection( drawing::Direction3D( 0.0, 0.0, 1.0 ) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_1, aDefaultLightDirection );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_2, ChartTypeHelper::getDefaultSimpleLightDirection(nullptr));
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_3, aDefaultLightDirection );
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 378d0f84b460..f7f1ff7ef1d8 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -119,7 +119,7 @@ void lcl_setRole(
 {
     Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY );
     if( xSeqProp.is())
-        xSeqProp->setPropertyValue( "Role", uno::makeAny( rRole ));
+        xSeqProp->setPropertyValue( "Role", uno::Any( rRole ));
 }
 
 void lcl_addSequenceToDataSource(
@@ -153,7 +153,7 @@ void lcl_setXMLRangePropertyAtDataSequence(
         Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW );
         Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo());
         if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ))
-            xProp->setPropertyValue( aXMLRangePropName, uno::makeAny( rXMLRange ));
+            xProp->setPropertyValue( aXMLRangePropName, uno::Any( rXMLRange ));
     }
     catch( const uno::Exception & ex )
     {
@@ -316,10 +316,10 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
     OSL_ASSERT( xErrorBar.is());
     if( xErrorBar.is())
     {
-        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny( nStyle ));
+        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle ));
     }
 
-    xSeriesProp->setPropertyValue( aPropName, uno::makeAny( xErrorBar ));
+    xSeriesProp->setPropertyValue( aPropName, uno::Any( xErrorBar ));
 
     return xErrorBar;
 }
@@ -357,7 +357,7 @@ void StatisticsHelper::removeErrorBars(
 {
     Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError ));
     if ( xErrorBar.is())
-        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny(
+        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any(
                                          css::chart::ErrorBarStyle::NONE ));
 }
 
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 14b0461c18a2..e9e7c45e7702 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -81,7 +81,7 @@ void lcl_RotateLightSource( const Reference< beans::XPropertySet >& xSceneProper
                     aLightVector = rRotationMatrix*aLightVector;
 
                     xSceneProperties->setPropertyValue( rLightSourceDirection
-                        , uno::makeAny( BaseGFXHelper::B3DVectorToDirection3D( aLightVector ) ) );
+                        , uno::Any( BaseGFXHelper::B3DVectorToDirection3D( aLightVector ) ) );
                 }
             }
         }
@@ -205,13 +205,13 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     if( rScheme == ThreeDLookScheme_Unknown)
         return;
 
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::makeAny( true ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::Any( true ) );
 
     uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY );
     uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) );
-    uno::Any aADirection( uno::makeAny( rScheme == ThreeDLookScheme_Simple
+    uno::Any aADirection( rScheme == ThreeDLookScheme_Simple
         ? ChartTypeHelper::getDefaultSimpleLightDirection(xChartType)
-        : ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) ) );
+        : ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) );
 
     xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, aADirection );
     //rotate light direction when right angled axes are off but supported
@@ -230,10 +230,10 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     }
 
     sal_Int32 nColor = ::chart::ChartTypeHelper::getDefaultDirectLightColor( rScheme==ThreeDLookScheme_Simple, xChartType );
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, uno::makeAny( nColor ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, uno::Any( nColor ) );
 
     sal_Int32 nAmbientColor = ::chart::ChartTypeHelper::getDefaultAmbientLightColor( rScheme==ThreeDLookScheme_Simple, xChartType );
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, uno::makeAny( nAmbientColor ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, uno::Any( nAmbientColor ) );
 }
 
 bool lcl_isRealisticScheme( drawing::ShadeMode aShadeMode
@@ -957,7 +957,7 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >
             xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bOldRightAngledAxes;
             if( bOldRightAngledAxes!=bRightAngledAxes)
             {
-                xSceneProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( bRightAngledAxes ));
+                xSceneProperties->setPropertyValue( "RightAngledAxes", uno::Any( bRightAngledAxes ));
                 if(bRightAngledAxes)
                 {
                     ::basegfx::B3DHomMatrix aInverseRotation( lcl_getInverseRotationMatrix( xSceneProperties ) );
@@ -1012,7 +1012,7 @@ void ThreeDHelper::setRotationAngleToDiagram(
 
         //set new rotation to transformation matrix
         xSceneProperties->setPropertyValue(
-            "D3DTransformMatrix", uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
+            "D3DTransformMatrix", uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 
         //rotate lights if RightAngledAxes are not set or not supported
         bool bRightAngledAxes = false;
@@ -1129,7 +1129,7 @@ void ThreeDHelper::setCameraDistance(
         aVRP.setLength(fCameraDistance);
         aCG.vrp = BaseGFXHelper::B3DVectorToPosition3D( aVRP );
 
-        xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCG ));
+        xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::Any( aCG ));
     }
     catch( const uno::Exception & ex )
     {
@@ -1225,7 +1225,7 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD
             if( ! ( (xProp->getPropertyValue( "D3DSceneShadeMode" )>>=aOldShadeMode) &&
                     aOldShadeMode == aShadeMode ))
             {
-                xProp->setPropertyValue( "D3DSceneShadeMode", uno::makeAny( aShadeMode ));
+                xProp->setPropertyValue( "D3DSceneShadeMode", uno::Any( aShadeMode ));
             }
         }
 
@@ -1256,13 +1256,13 @@ void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet
         return;
 
     drawing::CameraGeometry aCameraGeo( ThreeDHelper::getDefaultCameraGeometry( bPieOrDonut ) );
-    xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCameraGeo ));
+    xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::Any( aCameraGeo ));
 
     ::basegfx::B3DHomMatrix aSceneRotation;
     if( bPieOrDonut )
         aSceneRotation.rotate( -F_PI/3.0, 0, 0 );
     xSceneProperties->setPropertyValue( "D3DTransformMatrix",
-        uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
+        uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 }
 
 void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >& xSceneProperties )
@@ -1280,13 +1280,13 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
     try
     {
         xSceneProperties->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode;
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::Any( false ) );
     }
     catch( const uno::Exception & ex )
     {
@@ -1332,7 +1332,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     rnRoundedEdges = static_cast< sal_Int32 >( nPercentDiagonal );
 
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                        , aPercentDiagonalPropertyName, uno::makeAny(nPercentDiagonal) ) )
+                        , aPercentDiagonalPropertyName, uno::Any(nPercentDiagonal) ) )
                         bDifferentRoundedEdges = true;
                 }
                 catch( const uno::Exception& e )
@@ -1345,7 +1345,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     xProp->getPropertyValue( aBorderStylePropertyName ) >>= aLineStyle;
 
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                        , aBorderStylePropertyName, uno::makeAny(aLineStyle) ) )
+                        , aBorderStylePropertyName, uno::Any(aLineStyle) ) )
                         bDifferentObjectLines = true;
                 }
                 catch( const uno::Exception& e )
@@ -1363,7 +1363,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     sal_Int32 nCurrentRoundedEdges = static_cast< sal_Int32 >( nPercentDiagonal );
                     if(nCurrentRoundedEdges!=rnRoundedEdges
                         || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                            , aPercentDiagonalPropertyName, uno::makeAny( static_cast< sal_Int16 >(rnRoundedEdges) ) ) )
+                            , aPercentDiagonalPropertyName, uno::Any( static_cast< sal_Int16 >(rnRoundedEdges) ) ) )
                     {
                         bDifferentRoundedEdges = true;
                     }
@@ -1375,7 +1375,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     xProp->getPropertyValue( aBorderStylePropertyName ) >>= aCurrentLineStyle;
                     if(aCurrentLineStyle!=aLineStyle
                         || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                            , aBorderStylePropertyName, uno::makeAny(aLineStyle) ) )
+                            , aBorderStylePropertyName, uno::Any(aLineStyle) ) )
                         bDifferentObjectLines = true;
                 }
             }
@@ -1407,8 +1407,8 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
     if(nObjectLines==1)
         aLineStyle = drawing::LineStyle_SOLID;
 
-    uno::Any aALineStyle( uno::makeAny(aLineStyle));
-    uno::Any aARoundedEdges( uno::makeAny( static_cast< sal_Int16 >( nRoundedEdges )));
+    uno::Any aALineStyle( aLineStyle);
+    uno::Any aARoundedEdges( static_cast< sal_Int16 >( nRoundedEdges ));
 
     ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 7a3290b86f6d..5701eb1bc510 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -181,7 +181,7 @@ uno::Reference< XTitle > TitleHelper::createOrShowTitle(
     if( xTitled.is())
     {
         css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW);
-        xProps->setPropertyValue("Visible",css::uno::makeAny(true));
+        xProps->setPropertyValue("Visible",css::uno::Any(true));
         return xTitled;
     }
     else
@@ -218,7 +218,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
         uno::Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
         if( xProps.is() )
         {
-            xProps->setPropertyValue( "Show", uno::makeAny( false ) );
+            xProps->setPropertyValue( "Show", uno::Any( false ) );
             xTitled = lcl_getTitleParent( eTitleType, xModel );
         }
     }
@@ -284,7 +284,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
                             || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) )
                         {
                             double fNewAngleDegree = 90.0;
-                            xTitleProps->setPropertyValue( "TextRotation", uno::makeAny( fNewAngleDegree ));
+                            xTitleProps->setPropertyValue( "TextRotation", uno::Any( fNewAngleDegree ));
                         }
                     }
                 }
@@ -369,7 +369,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText
         {
             try
             {
-                uno::Any aFontSize( uno::makeAny( *pDefaultCharHeight ));
+                uno::Any aFontSize( *pDefaultCharHeight );
                 xFormattedString->setPropertyValue( "CharHeight", aFontSize );
                 xFormattedString->setPropertyValue( "CharHeightAsian", aFontSize );
                 xFormattedString->setPropertyValue( "CharHeightComplex", aFontSize );
@@ -400,7 +400,7 @@ void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex
     if( xTitled.is())
     {
         css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW);
-        xProps->setPropertyValue("Visible",css::uno::makeAny(false));
+        xProps->setPropertyValue("Visible",css::uno::Any(false));
     }
 }
 
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index c4d7290d6fee..3ec0ff23343e 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -79,7 +79,7 @@ UncachedDataSequence::UncachedDataSequence(
           m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
 {
     registerProperties();
-    setFastPropertyValue_NoBroadcast( PROP_PROPOSED_ROLE, uno::makeAny( rRole ));
+    setFastPropertyValue_NoBroadcast( PROP_PROPOSED_ROLE, uno::Any( rRole ));
 }
 
 UncachedDataSequence::UncachedDataSequence( const UncachedDataSequence & rSource )
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 5a0cdef9a61c..84195460e1a0 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -74,12 +74,12 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
 
 void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
 {
-    rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::Any( OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::Any( sal_Int32(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::Any( sal_Int32(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedProperty* >& rList )
@@ -90,32 +90,32 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
-    rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( false ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::Any( awt::Gradient() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::Any( awt::Gradient() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::Any( drawing::Hatch() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
-//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::makeAny( drawing::RectanglePoint_LEFT_TOP ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::makeAny( false ) ) );//todo correct default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::makeAny( drawing::BitmapMode_REPEAT ) ) );
+//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::Any( uno::Reference< awt::XBitmap > (0) ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::Any( OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::Any( false ) ) );//todo correct default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::Any( sal_Int32(10) ) ) );//todo which default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::Any( sal_Int32(10) ) ) );//todo which default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::Any( drawing::BitmapMode_REPEAT ) ) );
 }
 
 } //namespace chart
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 78c86c73852a..a88cd561722e 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -130,7 +130,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
     {
         OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
-        aWrappedException.TargetException = uno::makeAny( ex );
+        aWrappedException.TargetException <<= ex;
         throw aWrappedException;
     }
 }
@@ -168,7 +168,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
     {
         OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
-        aWrappedException.TargetException = uno::makeAny( ex );
+        aWrappedException.TargetException <<= ex;
         throw aWrappedException;
     }
 
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 52986ff88415..5dcb9a89bd1a 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -786,9 +786,9 @@ bool VCartesianAxis::createTextShapes(
             nExtraColor, bHasExtraColor);
 
         if(pColorAny)
-            *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor);
+            *pColorAny <<= bHasExtraColor?nExtraColor:nColor;
         if(pLimitedSpaceAny)
-            *pLimitedSpaceAny = uno::makeAny(sal_Int32(nLimitedSpaceForText*pTickInfo->nFactorForLimitedTextWidth));
+            *pLimitedSpaceAny <<= sal_Int32(nLimitedSpaceForText*pTickInfo->nFactorForLimitedTextWidth);
 
         B2DVector aTickScreenPos2D = pTickInfo->aTickScreenPosition;
         aTickScreenPos2D += aTextToTickDistance;
@@ -954,9 +954,9 @@ bool VCartesianAxis::createTextShapesSimple(
             nExtraColor, bHasExtraColor);
 
         if(pColorAny)
-            *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor);
+            *pColorAny <<= bHasExtraColor?nExtraColor:nColor;
         if(pLimitedSpaceAny)
-            *pLimitedSpaceAny = uno::makeAny(sal_Int32(-1*pTickInfo->nFactorForLimitedTextWidth));
+            *pLimitedSpaceAny <<= sal_Int32(-1*pTickInfo->nFactorForLimitedTextWidth);
 
         B2DVector aTickScreenPos2D = pTickInfo->aTickScreenPosition;
         aTickScreenPos2D += aTextToTickDistance;
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 0b3de68f3301..02b23221c50a 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -185,7 +185,7 @@ void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLinePropert
     for( sal_Int32 nN=0; nN < rGridPropertiesList.getLength(); nN++ )
     {
         if(!AxisHelper::isGridVisible( rGridPropertiesList[nN] ))
-            aLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE );
+            aLineProperties.LineStyle <<= drawing::LineStyle_NONE;
         else
             aLineProperties.initFromPropertySet( rGridPropertiesList[nN] );
         rLinePropertiesList.push_back(aLineProperties);
@@ -270,7 +270,7 @@ void VCartesianGrid::createShapes()
 
             //create handle shape:
             VLineProperties aHandleLineProperties;
-            aHandleLineProperties.LineStyle    = uno::makeAny( drawing::LineStyle_NONE );
+            aHandleLineProperties.LineStyle    <<= drawing::LineStyle_NONE;
             Reference< drawing::XShape > xHandleShape =
                 m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties );
             ::chart::AbstractShapeFactory::setShapeName( xHandleShape, "HandlesOnly" );
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 0baae40e62b7..21ee8e2543c0 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -113,7 +113,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
                 aLabel = aFixedNumberFormatter.getFormattedString( pTickInfo->getUnscaledTickValue(), nExtraColor, bHasExtraColor );
 
             if(pColorAny)
-                *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor);
+                *pColorAny <<= bHasExtraColor?nExtraColor:nColor;
 
             double fLogicAngle = pTickInfo->getUnscaledTickValue();
 
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 088994157655..b0f3fdb63d86 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -120,7 +120,7 @@ uno::Any AreaChart::getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPo
     Symbol* pSymbolProperties = rSeries.getSymbolProperties( nPointIndex );
     if( pSymbolProperties )
     {
-        aRet = uno::makeAny(*pSymbolProperties);
+        aRet <<= *pSymbolProperties;
     }
 
     return aRet;
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 261cf4f6847b..764dae06a6eb 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -808,7 +808,7 @@ void BarChart::createShapes()
                                 if(!rtl::math::isNan(nPropVal))
                                 {
                                     uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-                                    xProps->setPropertyValue("FillColor", uno::makeAny(static_cast<sal_Int32>(nPropVal)));
+                                    xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
                                 }
                             }
                             //set name/classified ObjectID (CID)
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index af4f65227d17..a435ceed43d6 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -316,7 +316,7 @@ void BubbleChart::createShapes()
                             if(!rtl::math::isNan(nPropVal))
                             {
                                 uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-                                xProps->setPropertyValue("FillColor", uno::makeAny(static_cast<sal_Int32>(nPropVal)));
+                                xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
                             }
                         }
                         if(bHasBorderColorMapping)
@@ -325,7 +325,7 @@ void BubbleChart::createShapes()
                             if(!rtl::math::isNan(nPropVal))
                             {
                                 uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-                                xProps->setPropertyValue("LineColor", uno::makeAny(static_cast<sal_Int32>(nPropVal)));
+                                xProps->setPropertyValue("LineColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
                             }
                         }
 
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index e62036a048c0..591e4c98969e 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -105,7 +105,7 @@ uno::Any NetChart::getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPoi
     Symbol* pSymbolProperties = rSeries.getSymbolProperties( nPointIndex );
     if( pSymbolProperties )
     {
-        aRet = uno::makeAny(*pSymbolProperties);
+        aRet <<= *pSymbolProperties;
     }
 
     return aRet;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 0e4e26db1d8d..a510604d44fc 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -650,8 +650,8 @@ void PieChart::createShapes()
                 if (!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is())
                 {
                     apOverwritePropertiesMap.reset( new tPropertyNameValueMap() );
-                    (*apOverwritePropertiesMap)["FillColor"] = uno::makeAny(
-                        m_xColorScheme->getColorByIndex( nPointIndex ));
+                    (*apOverwritePropertiesMap)["FillColor"] <<=
+                        m_xColorScheme->getColorByIndex( nPointIndex );
                 }
 
                 ///create data point
@@ -666,7 +666,7 @@ void PieChart::createShapes()
                     if(!rtl::math::isNan(nPropVal))
                     {
                         uno::Reference< beans::XPropertySet > xProps( xPointShape, uno::UNO_QUERY_THROW );
-                        xProps->setPropertyValue("FillColor", uno::makeAny(static_cast<sal_Int32>( nPropVal)));
+                        xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>( nPropVal)));
                     }
                 }
 
@@ -1182,7 +1182,7 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi
                 sal_Int32 nColor = 0;
                 xProp->getPropertyValue("CharColor") >>= nColor;
                 if( nColor != -1 )//automatic font color does not work for lines -> fallback to black
-                    aVLineProperties.Color = uno::makeAny(nColor);
+                    aVLineProperties.Color <<= nColor;
             }
             m_pShapeFactory->createLine2D( rInfo.xTextTarget, aPoints, &aVLineProperties );
         }
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index fdfc059c11d9..35bbe6fb74ce 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -578,9 +578,9 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
 
             Sequence< tAnySequence > aParaPropValues(3);
             aParaPropValues[1].realloc(1);
-            aParaPropValues[1][0] = uno::makeAny( style::ParagraphAdjust_CENTER );
+            aParaPropValues[1][0] <<= style::ParagraphAdjust_CENTER;
             aParaPropValues[2].realloc(1);
-            aParaPropValues[2][0] = uno::makeAny( style::ParagraphAdjust_CENTER );
+            aParaPropValues[2][0] <<= style::ParagraphAdjust_CENTER;
 
             //create text shape
             xTextShape = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory)->
@@ -638,7 +638,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
                 sal_Int32 aTextLineHeight =  aTextSize.Height / nLineCountForSymbolsize;
 
                 // set maximum text width
-                uno::Any aTextMaximumFrameWidth = uno::makeAny( nTextWidth );
+                uno::Any aTextMaximumFrameWidth( nTextWidth );
                 xProp->setPropertyValue( "TextMaximumFrameWidth", aTextMaximumFrameWidth );
 
                 // compute the total lines of text
@@ -2421,7 +2421,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
 
             OSL_ASSERT( xPointSet.is());
             xPointSet->setPropertyValue(
-                "Color", uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex )));
+                "Color", uno::Any( m_xColorScheme->getColorByIndex( nPointIndex )));
         }
     }
 
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 85915f4e350f..29c5ab3d49c4 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -194,7 +194,7 @@ void VDiagram::createShapes_2d()
                 {
                     //CID for selection handling
                     OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
-                    xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) );
+                    xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::Any( aWallCID ) );
                 }
             }
             catch( const uno::Exception& e )
@@ -440,7 +440,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
             E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape ));
 
             m_xAspectRatio3D->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aResult )) );
+                , uno::Any(BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aResult )) );
         }
         catch( const uno::Exception& e )
         {
@@ -568,7 +568,7 @@ void VDiagram::createShapes_3d()
         {
             //ignore distance and focal length from file format and model completely
             //use vrp only to indicate the distance of the camera and thus influence the perspective
-            xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_DISTANCE, uno::makeAny(
+            xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_DISTANCE, uno::Any(
                                         static_cast<sal_Int32>(ThreeDHelper::getCameraDistance( xSourceProp ))));
             xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE,
                                         xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE));
@@ -602,7 +602,7 @@ void VDiagram::createShapes_3d()
             //#i98497# 3D charts are rendered with wrong size
             E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape ));
             xDestProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX,
-                    uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) );
+                    uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -659,7 +659,7 @@ void VDiagram::createShapes_3d()
                 aM.scale( fXScale, fYScale, fZScale );
                 E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape ));
                 xShapeProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                    , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aM)) );
+                    , uno::Any(BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aM)) );
             }
             catch( const uno::Exception& e )
             {
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 5d79ca406723..e0ddffa0c2d7 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -154,8 +154,8 @@ void AbstractShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XS
     {
         try
         {
-            xShapeProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ));
-            xShapeProp->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ));
+            xShapeProp->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ));
+            xShapeProp->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE ));
         }
         catch( const uno::Exception& e )
         {
@@ -178,7 +178,7 @@ void AbstractShapeFactory::setShapeName( const uno::Reference< drawing::XShape >
         try
         {
             xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME
-                , uno::makeAny( rName ) );
+                , uno::Any( rName ) );
         }
         catch( const uno::Exception& e )
         {
@@ -216,7 +216,7 @@ uno::Any AbstractShapeFactory::makeTransformation( const awt::Point& rScreenPosi
     // aM.scale( 1, 1 ); Oops? A scale with this parameters is neutral, line commented out
     aM.rotate( fRotationAnglePi );
     aM.translate( rScreenPosition2D.X, rScreenPosition2D.Y );
-    uno::Any aATransformation = uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) );
+    uno::Any aATransformation( B2DHomMatrixToHomogenMatrix3(aM) );
     return aATransformation;
 }
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c3ea04246c93..94404507feb2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -519,7 +519,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
                         uno::Any aAny = xPropertySet->getPropertyValue( "3DRelativeHeight" );
                         aAny >>= n3DRelativeHeightOldValue;
                         if (n3DRelativeHeightOldValue != n3DRelativeHeight)
-                            xPropertySet->setPropertyValue( "3DRelativeHeight", uno::makeAny(n3DRelativeHeight) );
+                            xPropertySet->setPropertyValue( "3DRelativeHeight", uno::Any(n3DRelativeHeight) );
                     }
                     catch (const uno::Exception&) { }
                 }
@@ -1290,13 +1290,13 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
 
     //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
     aFilterData[4].Name = "ScaleXNumerator";
-    aFilterData[4].Value = uno::makeAny( m_nScaleXNumerator );
+    aFilterData[4].Value <<= m_nScaleXNumerator;
     aFilterData[5].Name = "ScaleXDenominator";
-    aFilterData[5].Value = uno::makeAny( m_nScaleXDenominator );
+    aFilterData[5].Value <<= m_nScaleXDenominator;
     aFilterData[6].Name = "ScaleYNumerator";
-    aFilterData[6].Value = uno::makeAny( m_nScaleYNumerator );
+    aFilterData[6].Value <<= m_nScaleYNumerator;
     aFilterData[7].Name = "ScaleYDenominator";
-    aFilterData[7].Value = uno::makeAny( m_nScaleYDenominator );
+    aFilterData[7].Value <<= m_nScaleYDenominator;
 
 
     aProps[2].Name = "FilterData";
@@ -2060,7 +2060,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
         }
 
         if (nFormat >= 0 && nOldFormat != nFormat)
-            xSeriesOrPointProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(nFormat));
+            xSeriesOrPointProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(nFormat));
     }
 
     if(nFormat<0)
@@ -2501,7 +2501,7 @@ void formatPage(
         PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage );
 
         OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
-        aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString
+        aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( aCID ) ) ); //CID OUString
 
         tNameSequence aNames;
         tAnySequence aValues;
@@ -2967,7 +2967,7 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
     Any aRet;
     if( rPropertyName == "Resolution" )
     {
-        aRet = uno::makeAny( m_aPageResolution );
+        aRet <<= m_aPageResolution;
     }
     else
         throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", nullptr );
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 115654d66bd7..4d7291c03646 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -971,16 +971,16 @@ DummyChart* DummyChart::getRootShape()
 uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType )
 {
     if( rType == cppu::UnoType<drawing::XShapes>::get() )
-        return uno::makeAny(uno::Reference<drawing::XShapes>(this));
+        return uno::Any(uno::Reference<drawing::XShapes>(this));
     if( rType == cppu::UnoType<container::XIndexAccess>::get() )
-        return uno::makeAny(uno::Reference<container::XIndexAccess>(this));
+        return uno::Any(uno::Reference<container::XIndexAccess>(this));
     return DummyXShape::queryInterface(rType);
 }
 
 uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType )
 {
     if( rType == cppu::UnoType<drawing::XShapes>::get() )
-        return uno::makeAny(uno::Reference< drawing::XShapes >(this));
+        return uno::Any(uno::Reference< drawing::XShapes >(this));
     else
         return DummyXShape::queryAggregation( rType );
 }
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 84c279d2b591..50b18e7d2c3f 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -63,7 +63,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const
             eHorizontalAdjust = drawing::TextHorizontalAdjust_RIGHT;
         uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextHorizontalAdjust");
         if(pHorizontalAdjustAny)
-            *pHorizontalAdjustAny = uno::makeAny(eHorizontalAdjust);
+            *pHorizontalAdjustAny <<= eHorizontalAdjust;
     }
 
     //VerticalAdjustment
@@ -75,7 +75,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const
             eVerticalAdjust = drawing::TextVerticalAdjust_TOP;
         uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextVerticalAdjust");
         if(pVerticalAdjustAny)
-            *pVerticalAdjustAny = uno::makeAny(eVerticalAdjust);
+            *pVerticalAdjustAny <<= eVerticalAdjust;
     }
 }
 
@@ -87,7 +87,7 @@ void lcl_doDynamicFontResize( uno::Any* pAOldAndNewFontHeightAny
     if( pAOldAndNewFontHeightAny && ( *pAOldAndNewFontHeightAny >>= fOldFontHeight ) )
     {
         double fNewFontHeight = RelativeSizeHelper::calculate( fOldFontHeight, rOldReferenceSize, rNewReferenceSize );
-        *pAOldAndNewFontHeightAny = uno::makeAny(fNewFontHeight);
+        *pAOldAndNewFontHeightAny <<= fNewFontHeight;
     }
 }
 
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 39c740cc8c92..b06ae6afd432 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -351,7 +351,7 @@ uno::Reference< drawing::XShape > OpenglShapeFactory::createInvisibleRectangle(
             , const awt::Size& rSize )
 {
     dummy::DummyRectangle* pRectangle = new dummy::DummyRectangle(rSize);
-    pRectangle->setPropertyValue("Invisible", uno::makeAny(true));
+    pRectangle->setPropertyValue("Invisible", uno::Any(true));
     xTarget->add(pRectangle);
     return pRectangle;
 }
@@ -430,10 +430,10 @@ uno::Reference< drawing::XShape >
         drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
         drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
 
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
 
     }
 
@@ -451,7 +451,7 @@ uno::Reference< drawing::XShape >
     aM.translate( nXPos, nYPos );
 
     dummy::DummyText* pText = new dummy::DummyText(aString, aPropNames, aPropValues,
-            uno::makeAny(B2DHomMatrixToHomogenMatrix3(aM)), xTarget, nRotation);
+            uno::Any(B2DHomMatrixToHomogenMatrix3(aM)), xTarget, nRotation);
     pText->setName(rName);
     return pText;
 }
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 420ac93cafc2..ec00463fe4ea 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -452,20 +452,20 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
     PropertyMapper::getValueMap(aValueMap, aNameMap, xSourceProp);
 
     //some more shape properties apart from character properties, position-matrix and label string
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
     if( bName )
-        aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
+        aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
 
     if( nLimitedSpace > 0 )
     {
         if(bLimitedHeight)
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::Any(nLimitedSpace) ) ); //sal_Int32
         else
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
-        aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(true) ) );
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::Any(nLimitedSpace) ) ); //sal_Int32
+        aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::Any(true) ) );
     }
 
     PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap );
@@ -482,18 +482,18 @@ void PropertyMapper::getPreparedTextShapePropertyLists(
             , xSourceProp );
 
     // auto-grow makes sure the shape has the correct size after setting text
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny( true )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny( true )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any( drawing::TextHorizontalAdjust_CENTER )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any( drawing::TextVerticalAdjust_CENTER )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any( true )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any( true )));
 
     // set some distance to the border, in case it is shown
     const sal_Int32 nWidthDist  = 250;
     const sal_Int32 nHeightDist = 125;
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance",  uno::makeAny( nWidthDist )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::makeAny( nWidthDist )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::makeAny( nHeightDist )));
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::makeAny( nHeightDist )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance",  uno::Any( nWidthDist )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::Any( nWidthDist )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::Any( nHeightDist )));
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::Any( nHeightDist )));
 
     // use a line-joint showing the border of thick lines like two rectangles
     // filled in between.
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index d9ccc32000d6..2b4e85555dc7 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -401,12 +401,12 @@ uno::Reference<drawing::XShape>
             if(fDepth<0)
                 fDepth*=-1.0;
             xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
-                , uno::makeAny((sal_Int32)fDepth) );
+                , uno::Any((sal_Int32)fDepth) );
 
             //PercentDiagonal
             sal_Int16 nPercentDiagonal = bRounded ? 3 : 0;
             xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
-                , uno::makeAny( nPercentDiagonal ) );
+                , uno::Any( nPercentDiagonal ) );
 
             //Polygon
             xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
@@ -422,7 +422,7 @@ uno::Reference<drawing::XShape>
                             , rPosition.PositionZ - (fDepth/2.0));
                 drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
                 xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                    , uno::makeAny(aHM) );
+                    , uno::Any(aHM) );
             }
         }
         catch( const uno::Exception& e )
@@ -642,7 +642,7 @@ uno::Reference<drawing::XShape>
             //PercentDiagonal
             sal_Int16 nPercentDiagonal = 5;
             xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
-                , uno::makeAny( nPercentDiagonal ) );
+                , uno::Any( nPercentDiagonal ) );
 
             //Polygon
             sal_Int32 nVerticalSegmentCount = 0;
@@ -662,18 +662,18 @@ uno::Reference<drawing::XShape>
                 aM.translate(rPosition.PositionX, rPosition.PositionY, rPosition.PositionZ);
                 drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
                 xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                    , uno::makeAny(aHM) );
+                    , uno::Any(aHM) );
             }
 
             //Segments
             xProp->setPropertyValue( UNO_NAME_3D_HORZ_SEGS
-                , uno::makeAny(CHART_3DOBJECT_SEGMENTCOUNT) );
+                , uno::Any(CHART_3DOBJECT_SEGMENTCOUNT) );
             xProp->setPropertyValue( UNO_NAME_3D_VERT_SEGS
-                , uno::makeAny((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon
+                , uno::Any((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon
 
             //Reduced lines
             xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
-                , uno::makeAny(true) );
+                , uno::Any(true) );
         }
         catch( const uno::Exception& e )
         {
@@ -882,7 +882,7 @@ uno::Reference< drawing::XShape >
                 , fUnitCircleStartAngleDegree*F_PI/180.0, fUnitCircleWidthAngleDegree*F_PI/180.0
                 , aTransformationFromUnitCircle, fAngleSubdivisionRadian );
 
-            xProp->setPropertyValue( "PolyPolygonBezier", uno::makeAny( aCoords ) );
+            xProp->setPropertyValue( "PolyPolygonBezier", uno::Any( aCoords ) );
         }
         catch( const uno::Exception& e )
         {
@@ -935,36 +935,36 @@ uno::Reference< drawing::XShape >
 
             //depth
             xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
-                , uno::makeAny((sal_Int32)fDepth) );
+                , uno::Any((sal_Int32)fDepth) );
 
             //PercentDiagonal
             sal_Int16 nPercentDiagonal = 0;
             xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
-                , uno::makeAny( nPercentDiagonal ) );
+                , uno::Any( nPercentDiagonal ) );
 
             //Polygon
             drawing::PolyPolygonShape3D aPoly( BezierToPoly(aCoords) );
             ShapeFactory::closePolygon( aPoly );
             xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
-                , uno::makeAny( aPoly ) );
+                , uno::Any( aPoly ) );
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
-                , uno::makeAny( true ) );
+                , uno::Any( true ) );
 
             //Reduced lines
             xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
-                , uno::makeAny( true ) );
+                , uno::Any( true ) );
 
             //TextureProjectionMode
             xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y
-                , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
+                , uno::Any( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
 
             //TextureProjectionMode
             xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_X
-                , uno::makeAny( drawing::TextureProjectionMode_PARALLEL ) );
+                , uno::Any( drawing::TextureProjectionMode_PARALLEL ) );
             xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y
-                , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
+                , uno::Any( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
         }
         catch( const uno::Exception& e )
         {
@@ -1013,15 +1013,15 @@ uno::Reference< drawing::XShape >
             //NormalsKind
             if(bFlatNormals)
                 xProp->setPropertyValue( UNO_NAME_3D_NORMALS_KIND
-                    , uno::makeAny( drawing::NormalsKind_FLAT ) );
+                    , uno::Any( drawing::NormalsKind_FLAT ) );
 
             //LineOnly
             xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
-                , uno::makeAny( false) );
+                , uno::Any( false) );
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
-                , uno::makeAny(bDoubleSided) );
+                , uno::Any(bDoubleSided) );
 
             if( xSourceProp.is())
                 PropertyMapper::setMappedProperties( xProp, xSourceProp, rPropertyNameMap );
@@ -1060,20 +1060,20 @@ uno::Reference< drawing::XShape >
         {
             //depth
             xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
-                , uno::makeAny((sal_Int32)fDepth) );
+                , uno::Any((sal_Int32)fDepth) );
 
             //PercentDiagonal
             sal_Int16 nPercentDiagonal = 0;
             xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
-                , uno::makeAny( nPercentDiagonal ) );
+                , uno::Any( nPercentDiagonal ) );
 
             //Polygon
             xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
-                , uno::makeAny( rPolyPolygon ) );
+                , uno::Any( rPolyPolygon ) );
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
-                , uno::makeAny( true) );
+                , uno::Any( true) );
 
             //the z component of the polygon is now ignored by the drawing layer,
             //so we need to translate the object via transformation matrix
@@ -1087,7 +1087,7 @@ uno::Reference< drawing::XShape >
                             , rPolyPolygon.SequenceZ[0][0] );
                 drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
                 xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                    , uno::makeAny(aHM) );
+                    , uno::Any(aHM) );
             }
         }
         catch( const uno::Exception& e )
@@ -1123,12 +1123,12 @@ uno::Reference< drawing::XShape >
 
             //Polygon
             xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
-                , uno::makeAny( aPoints ) );
+                , uno::Any( aPoints ) );
 
             //ZOrder
             //an area should always be behind other shapes
             xProp->setPropertyValue( UNO_NAME_MISC_OBJ_ZORDER
-                , uno::makeAny( sal_Int32(0) ) );
+                , uno::Any( sal_Int32(0) ) );
         }
         catch( const uno::Exception& e )
         {
@@ -1669,15 +1669,15 @@ uno::Reference< drawing::XShape >
 
             //Polygon
             xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
-                , uno::makeAny( aPoints ) );
+                , uno::Any( aPoints ) );
 
             //LineColor
             xProp->setPropertyValue( UNO_NAME_LINECOLOR
-                , uno::makeAny( nBorderColor ) );
+                , uno::Any( nBorderColor ) );
 
             //FillColor
             xProp->setPropertyValue( UNO_NAME_FILLCOLOR
-                , uno::makeAny( nFillColor ) );
+                , uno::Any( nFillColor ) );
         }
         catch( const uno::Exception& e )
         {
@@ -1726,7 +1726,7 @@ uno::Reference< drawing::XShape >
     {
         try
         {
-            xProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic ));
+            xProp->setPropertyValue( "Graphic", uno::Any( xGraphic ));
         }
         catch( const uno::Exception& e )
         {
@@ -1799,7 +1799,7 @@ uno::Reference< drawing::XShapes >
                 {
                     ::basegfx::B3DHomMatrix aM;
                     xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-                        , uno::makeAny(B3DHomMatrixToHomogenMatrix(aM)) );
+                        , uno::Any(B3DHomMatrixToHomogenMatrix(aM)) );
                 }
                 catch( const uno::Exception& e )
                 {
@@ -1861,7 +1861,7 @@ uno::Reference< drawing::XShape >
         {
             drawing::CircleKind eKind = drawing::CircleKind_FULL;
             xProp->setPropertyValue( UNO_NAME_CIRCKIND
-                , uno::makeAny( eKind ) );
+                , uno::Any( eKind ) );
         }
         catch( const uno::Exception& e )
         {
@@ -1912,11 +1912,11 @@ uno::Reference< drawing::XShape >
         {
             //Polygon
             xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
-                , uno::makeAny( rPoints ) );
+                , uno::Any( rPoints ) );
 
             //LineOnly
             xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
-                , uno::makeAny( true ) );
+                , uno::Any( true ) );
 
             //Transparency
             if(rLineProperties.Transparence.hasValue())
@@ -1937,7 +1937,7 @@ uno::Reference< drawing::XShape >
             if(rLineProperties.Color.hasValue())
                 xProp->setPropertyValue( UNO_NAME_LINECOLOR
                     , rLineProperties.Color );
-                    //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) );
+                    //, uno::Any( sal_Int32( Color(COL_RED).GetColor()) ) );
         }
         catch( const uno::Exception& e )
         {
@@ -1973,7 +1973,7 @@ uno::Reference< drawing::XShape >
         {
             //Polygon
             xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
-                , uno::makeAny( rPoints ) );
+                , uno::Any( rPoints ) );
 
             if(pLineProperties)
             {
@@ -2282,14 +2282,14 @@ uno::Reference< drawing::XShape >
             drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
             drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
 
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
 
             //set name/classified ObjectID (CID)
             if( !aName.isEmpty() )
-                aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aName ) ) ); //CID OUString
+                aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( aName ) ) ); //CID OUString
         }
 
         //set global title properties
@@ -2375,10 +2375,10 @@ uno::Reference< drawing::XShape >
             sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fXFraction ) );
             float fYFraction = 0.30f;
             sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fYFraction ) );
-            xShapeProp->setPropertyValue( "TextLeftDistance", uno::makeAny( nXDistance ) );
-            xShapeProp->setPropertyValue( "TextRightDistance", uno::makeAny( nXDistance ) );
-            xShapeProp->setPropertyValue( "TextUpperDistance", uno::makeAny( nYDistance ) );
-            xShapeProp->setPropertyValue( "TextLowerDistance", uno::makeAny( nYDistance ) );
+            xShapeProp->setPropertyValue( "TextLeftDistance", uno::Any( nXDistance ) );
+            xShapeProp->setPropertyValue( "TextRightDistance", uno::Any( nXDistance ) );
+            xShapeProp->setPropertyValue( "TextUpperDistance", uno::Any( nYDistance ) );
+            xShapeProp->setPropertyValue( "TextLowerDistance", uno::Any( nYDistance ) );
         }
         sal_Int32 nXPos = rPos.X;
         sal_Int32 nYPos = rPos.Y;
@@ -2388,7 +2388,7 @@ uno::Reference< drawing::XShape >
         ::basegfx::B2DHomMatrix aM;
         aM.rotate( -nRotation*F_PI/180.0 );//#i78696#->#i80521#
         aM.translate( nXPos, nYPos );
-        xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) );
+        xShapeProp->setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) );
     }
     catch( const uno::Exception& e )
     {
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 766b16d9039c..8007f2931efb 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -98,7 +98,7 @@ void lcl_getProperties(
         ::chart::tPropertyNameValueMap aLineFillValueMap;
         ::chart::PropertyMapper::getValueMap( aLineFillValueMap, ::chart::PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xLegendProp );
 
-        aLineFillValueMap[ "LineJoint" ] = uno::makeAny( drawing::LineJoint_ROUND );
+        aLineFillValueMap[ "LineJoint" ] <<= drawing::LineJoint_ROUND;
 
         ::chart::PropertyMapper::getMultiPropertyListsFromValueMap(
             rOutLineFillProperties.first, rOutLineFillProperties.second, aLineFillValueMap );
@@ -108,10 +108,10 @@ void lcl_getProperties(
         ::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp );
 
         drawing::TextHorizontalAdjust eHorizAdjust( drawing::TextHorizontalAdjust_LEFT );
-        aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( true );
-        aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( true );
-        aTextValueMap[ "TextHorizontalAdjust" ] = uno::makeAny( eHorizAdjust );
-        aTextValueMap[ "TextMaximumFrameWidth" ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend
+        aTextValueMap[ "TextAutoGrowHeight" ] <<= true;
+        aTextValueMap[ "TextAutoGrowWidth" ] <<= true;
+        aTextValueMap[ "TextHorizontalAdjust" ] <<= eHorizAdjust;
+        aTextValueMap[ "TextMaximumFrameWidth" ] <<= rReferenceSize.Width; //needs to be overwritten by actual available space in the legend
 
         // recalculate font size
         awt::Size aPropRefSize;
@@ -120,21 +120,21 @@ void lcl_getProperties(
             (aPropRefSize.Height > 0) &&
             (aTextValueMap[ "CharHeight" ] >>= fFontHeight) )
         {
-            aTextValueMap[ "CharHeight" ] = uno::makeAny(
+            aTextValueMap[ "CharHeight" ] <<=
                 static_cast< float >(
-                    ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+                    ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
 
             if( aTextValueMap[ "CharHeightAsian" ] >>= fFontHeight )
             {
-                aTextValueMap[ "CharHeightAsian" ] = uno::makeAny(
+                aTextValueMap[ "CharHeightAsian" ] <<=
                     static_cast< float >(
-                        ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+                        ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
             }
             if( aTextValueMap[ "CharHeightComplex" ] >>= fFontHeight )
             {
-                aTextValueMap[ "CharHeightComplex" ] = uno::makeAny(
+                aTextValueMap[ "CharHeightComplex" ] <<=
                     static_cast< float >(
-                        ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+                        ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
             }
         }
 
@@ -288,7 +288,7 @@ awt::Size lcl_placeLegendEntries(
             // #i109336# Improve auto positioning in chart
             nMaxTextWidth = rAvailableSpace.Width * 3 / 10;
         }
-        *pFrameWidthAny = uno::makeAny(nMaxTextWidth);
+        *pFrameWidthAny <<= nMaxTextWidth;
     }
 
     ::std::vector< Reference< drawing::XShape > > aTextShapes;
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 125d456de506..4579d45a6b7c 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -72,7 +72,7 @@ void getPropNamesAndValues( const Reference< beans::XPropertySet >& xProp,
         // use legend entry height as upper limit for line width
         sal_Int32 nMaxLineWidthForLegend = aMaxSymbolExtent.Height;
         if( nLineWidth>nMaxLineWidthForLegend )
-            *pLineWidthAny = uno::makeAny( nMaxLineWidthForLegend );
+            *pLineWidthAny <<= nMaxLineWidthForLegend;
     }
 }
 
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index e3486ce84cf3..2c0330bf2ff9 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -29,10 +29,10 @@ using namespace ::com::sun::star;
 
 VLineProperties::VLineProperties()
 {
-    this->Color = uno::makeAny( sal_Int32(0x000000) ); //type sal_Int32 UNO_NAME_LINECOLOR
-    this->LineStyle = uno::makeAny( drawing::LineStyle_SOLID ); //type drawing::LineStyle for property UNO_NAME_LINESTYLE
-    this->Transparence = uno::makeAny( sal_Int16(0) );//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
-    this->Width = uno::makeAny( sal_Int32(0) );//type sal_Int32 for property UNO_NAME_LINEWIDTH
+    this->Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR
+    this->LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE
+    this->Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
+    this->Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH
 }
 
 void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
@@ -53,7 +53,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert
         }
     }
     else
-        this->LineStyle = uno::makeAny( drawing::LineStyle_NONE );
+        this->LineStyle <<= drawing::LineStyle_NONE;
 }
 
 bool VLineProperties::isLineVisible() const
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index a2212ca1b602..4fafd1fccb01 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -96,7 +96,7 @@ void VTitle::changePosition( const awt::Point& rPos )
         ::basegfx::B2DHomMatrix aM;
         aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521#
         aM.translate( m_nXPos, m_nYPos);
-        xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) );
+        xShapeProp->setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) );
     }
     catch( const uno::Exception& e )
     {