Just use Any ctor instead of makeAny in sw

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

21 files changed, 78 insertions, 78 deletions

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index bf5b82fd5f81..958b326f6400 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -772,15 +772,15 @@ void SwModule::ExecOther(SfxRequest& rReq)
             // now the record has to be merged into the source document
             // TODO can we re-use PerformMailMerge() here somehow?
             const SwDBData& rDBData = xConfigItem->GetCurrentDBData();
-            uno::Sequence<uno::Any> vSelection({ uno::makeAny(xConfigItem->GetResultSetPosition()) });
+            uno::Sequence<uno::Any> vSelection({ uno::Any(xConfigItem->GetResultSetPosition()) });
             svx::ODataAccessDescriptor aDescriptor(::comphelper::InitPropertySequence({
-                        {"Selection",        uno::makeAny(vSelection)},
-                        {"DataSourceName",   uno::makeAny(rDBData.sDataSource)},
-                        {"Command",          uno::makeAny(rDBData.sCommand)},
-                        {"CommandType",      uno::makeAny(rDBData.nCommandType)},
-                        {"ActiveConnection", uno::makeAny(xConfigItem->GetConnection().getTyped())},
-                        {"Filter",           uno::makeAny(xConfigItem->GetFilter())},
-                        {"Cursor",           uno::makeAny(xConfigItem->GetResultSet())}
+                        {"Selection",        uno::Any(vSelection)},
+                        {"DataSourceName",   uno::Any(rDBData.sDataSource)},
+                        {"Command",          uno::Any(rDBData.sCommand)},
+                        {"CommandType",      uno::Any(rDBData.nCommandType)},
+                        {"ActiveConnection", uno::Any(xConfigItem->GetConnection().getTyped())},
+                        {"Filter",           uno::Any(xConfigItem->GetFilter())},
+                        {"Cursor",           uno::Any(xConfigItem->GetResultSet())}
                         }));
 
             SwWrtShell& rSh = pView->GetWrtShell();
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index db389061771e..789a221ff090 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -720,7 +720,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
                 // TODO/MBA: testing
                 uno::Reference < beans::XPropertySet > xSet( rMedium.GetStorage(), uno::UNO_QUERY );
                 if ( xSet.is() )
-                    xSet->setPropertyValue("MediaType", uno::makeAny( SotExchange::GetFormatMimeType( nSaveClipId ) ) );
+                    xSet->setPropertyValue("MediaType", uno::Any( SotExchange::GetFormatMimeType( nSaveClipId ) ) );
             }
             catch (const uno::Exception&)
             {
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index db1f5d86e0dc..cf73c8c91947 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1509,7 +1509,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
                 if( pBasic )
                 {
                     // Notify the IDE
-                    SfxUnoAnyItem aShellItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( GetModel() ) );
+                    SfxUnoAnyItem aShellItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( GetModel() ) );
                     OUString aLibName( pBasic->GetName() );
                     SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
                     pSrcView->GetViewFrame()->GetDispatcher()->ExecuteList(
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index cf7d8b6282a0..ccd6afcc4075 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -383,7 +383,7 @@ void SwModule::ShowDBObj(SwView const & rView, const SwDBData& rData)
         aSelection.setDataSource(rData.sDataSource);
         aSelection[DataAccessDescriptorProperty::Command]       <<= rData.sCommand;
         aSelection[DataAccessDescriptorProperty::CommandType]   <<= rData.nCommandType;
-        xControllerSelection->select(makeAny(aSelection.createPropertyValueSequence()));
+        xControllerSelection->select(Any(aSelection.createPropertyValueSequence()));
     }
     else {
         OSL_FAIL("no selection supplier in the beamer!");
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 4833a6af0b7b..43dbde46bdb8 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -129,7 +129,7 @@ public:
         uno::Sequence<beans::PropertyValue> const ret(
             SwXNumberingRules::GetPropertiesForNumFormat(
                 *pNumFormat, *pCharStyleName, &dummy, ""));
-        return uno::makeAny(ret);
+        return uno::Any(ret);
     }
 
     // XIndexReplace
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 332911df9973..f7607bac9dda 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -814,7 +814,7 @@ static bool lcl_SaveDoc(
                                         *pStoreToFilterOptions));
         if( pSaveToFilterData->hasElements() )
             pDstMed->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA,
-                                        uno::makeAny(*pSaveToFilterData)));
+                                        uno::Any(*pSaveToFilterData)));
     }
 
     // convert fields to text if we are exporting to PDF.
@@ -1906,11 +1906,11 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBManager::GetColumnSupplier(uno::Ref
         }
 
         uno::Reference<beans::XPropertySet> xRowProperties(xRowSet, uno::UNO_QUERY);
-        xRowProperties->setPropertyValue("DataSourceName", uno::makeAny(sDataSource));
-        xRowProperties->setPropertyValue("Command", uno::makeAny(rTableOrQuery));
-        xRowProperties->setPropertyValue("CommandType", uno::makeAny(nCommandType));
-        xRowProperties->setPropertyValue("FetchSize", uno::makeAny(sal_Int32(10)));
-        xRowProperties->setPropertyValue("ActiveConnection", uno::makeAny(xConnection));
+        xRowProperties->setPropertyValue("DataSourceName", uno::Any(sDataSource));
+        xRowProperties->setPropertyValue("Command", uno::Any(rTableOrQuery));
+        xRowProperties->setPropertyValue("CommandType", uno::Any(nCommandType));
+        xRowProperties->setPropertyValue("FetchSize", uno::Any(sal_Int32(10)));
+        xRowProperties->setPropertyValue("ActiveConnection", uno::Any(xConnection));
         xRowSet->execute();
         xRet.set( xRowSet, uno::UNO_QUERY );
     }
@@ -2720,7 +2720,7 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType type, const uno::Reference
                 uno::Reference < beans::XPropertySet > xDSSettings;
                 aSettings >>= xDSSettings;
                 ::comphelper::copyProperties(*pSettings, xDSSettings);
-                xDSSettings->setPropertyValue("Extension", uno::makeAny(sExt));
+                xDSSettings->setPropertyValue("Extension", uno::Any(sExt));
             }
 
             uno::Reference<sdb::XDocumentDataSource> xDS(xNewInstance, uno::UNO_QUERY_THROW);
@@ -2745,7 +2745,7 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType type, const uno::Reference
                 // we can load it again next time the file is imported.
                 uno::Reference<lang::XMultiServiceFactory> xFactory(pDocShell->GetModel(), uno::UNO_QUERY);
                 uno::Reference<beans::XPropertySet> xPropertySet(xFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY);
-                xPropertySet->setPropertyValue("EmbeddedDatabaseName", uno::makeAny(aStreamRelPath));
+                xPropertySet->setPropertyValue("EmbeddedDatabaseName", uno::Any(aStreamRelPath));
 
                 // Store it only after setting the above property, so that only one data source gets registered.
                 SwDBManager::StoreEmbeddedDataSource(xStore, xStorage, aStreamRelPath, aOwnURL);
@@ -2844,9 +2844,9 @@ void SwDBManager::StoreEmbeddedDataSource(const uno::Reference<frame::XStorable>
 
     uno::Sequence<beans::PropertyValue> aSequence = comphelper::InitPropertySequence(
     {
-        {"TargetStorage", uno::makeAny(xStorage)},
-        {"StreamRelPath", uno::makeAny(rStreamRelPath)},
-        {"BaseURI", uno::makeAny(rOwnURL)}
+        {"TargetStorage", uno::Any(xStorage)},
+        {"StreamRelPath", uno::Any(rStreamRelPath)},
+        {"BaseURI", uno::Any(rOwnURL)}
     });
     if (bCopyTo)
         xStorable->storeToURL(sTmpName, aSequence);
@@ -3110,10 +3110,10 @@ uno::Reference<sdbc::XResultSet> SwDBManager::createCursor(const OUString& _sDat
             uno::Reference<beans::XPropertySet> xRowSetPropSet(xInstance, uno::UNO_QUERY);
             if(xRowSetPropSet.is())
             {
-                xRowSetPropSet->setPropertyValue("DataSourceName", uno::makeAny(_sDataSourceName));
-                xRowSetPropSet->setPropertyValue("ActiveConnection", uno::makeAny(_xConnection));
-                xRowSetPropSet->setPropertyValue("Command", uno::makeAny(_sCommand));
-                xRowSetPropSet->setPropertyValue("CommandType", uno::makeAny(_nCommandType));
+                xRowSetPropSet->setPropertyValue("DataSourceName", uno::Any(_sDataSourceName));
+                xRowSetPropSet->setPropertyValue("ActiveConnection", uno::Any(_xConnection));
+                xRowSetPropSet->setPropertyValue("Command", uno::Any(_sCommand));
+                xRowSetPropSet->setPropertyValue("CommandType", uno::Any(_nCommandType));
 
                 uno::Reference< sdb::XCompletedExecution > xRowSet(xInstance, uno::UNO_QUERY);
 
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 200cbec1a478..86c1a73f37d4 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -855,15 +855,15 @@ Reference< XResultSet> const & SwMailMergeConfigItem::GetResultSet() const
 
             Reference<XRowSet> xRowSet( xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY );
             Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
-            xRowProperties->setPropertyValue("DataSourceName", makeAny(m_pImpl->m_aDBData.sDataSource));
-            xRowProperties->setPropertyValue("Command", makeAny(m_pImpl->m_aDBData.sCommand));
-            xRowProperties->setPropertyValue("CommandType", makeAny(m_pImpl->m_aDBData.nCommandType));
-            xRowProperties->setPropertyValue("FetchSize", makeAny(sal_Int32(10)));
-            xRowProperties->setPropertyValue("ActiveConnection", makeAny(m_pImpl->m_xConnection.getTyped()));
+            xRowProperties->setPropertyValue("DataSourceName", Any(m_pImpl->m_aDBData.sDataSource));
+            xRowProperties->setPropertyValue("Command", Any(m_pImpl->m_aDBData.sCommand));
+            xRowProperties->setPropertyValue("CommandType", Any(m_pImpl->m_aDBData.nCommandType));
+            xRowProperties->setPropertyValue("FetchSize", Any(sal_Int32(10)));
+            xRowProperties->setPropertyValue("ActiveConnection", Any(m_pImpl->m_xConnection.getTyped()));
             try
             {
-                xRowProperties->setPropertyValue("ApplyFilter", makeAny(!m_pImpl->m_sFilter.isEmpty()));
-                xRowProperties->setPropertyValue("Filter", makeAny(m_pImpl->m_sFilter));
+                xRowProperties->setPropertyValue("ApplyFilter", Any(!m_pImpl->m_sFilter.isEmpty()));
+                xRowProperties->setPropertyValue("Filter", Any(m_pImpl->m_sFilter));
             }
             catch (const Exception&)
             {
@@ -909,8 +909,8 @@ void  SwMailMergeConfigItem::SetFilter(OUString const & rFilter)
 
     try
     {
-        xRowProperties->setPropertyValue("ApplyFilter", makeAny(!m_pImpl->m_sFilter.isEmpty()));
-        xRowProperties->setPropertyValue("Filter", makeAny(m_pImpl->m_sFilter));
+        xRowProperties->setPropertyValue("ApplyFilter", Any(!m_pImpl->m_sFilter.isEmpty()));
+        xRowProperties->setPropertyValue("Filter", Any(m_pImpl->m_sFilter));
         uno::Reference<XRowSet> xRowSet( m_pImpl->m_xResultSet, UNO_QUERY_THROW );
         xRowSet->execute();
     }
@@ -1004,7 +1004,7 @@ uno::Sequence<uno::Any> SwMailMergeConfigItem::GetSelection() const
     std::vector<uno::Any> vResult;
     for(sal_uInt32 nIdx=1; nIdx<nResultSetSize;++nIdx)
         if( !IsRecordExcluded(nIdx) && IsRecordIncluded(nIdx) )
-            vResult.push_back(uno::makeAny<sal_uInt32>(nIdx));
+            vResult.push_back(uno::Any(sal_uInt32(nIdx)));
     return comphelper::containerToSequence(vResult);
 }
 
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index 3e9a914a2917..37e7ff0ed1f8 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -103,11 +103,11 @@ IMPL_LINK_NOARG(SwWatermarkDialog, OKButtonHdl, weld::Button&, void)
 
     css::uno::Sequence<css::beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence(
     {
-        { "Text", css::uno::makeAny( sText ) },
-        { "Font", css::uno::makeAny( m_xFont->get_active_text() ) },
-        { "Angle", css::uno::makeAny( static_cast<sal_Int16>( m_xAngle->get_value(FieldUnit::DEGREE) ) ) },
-        { "Transparency", css::uno::makeAny( static_cast<sal_Int16>( m_xTransparency->get_value(FieldUnit::PERCENT) ) ) },
-        { "Color", css::uno::makeAny( static_cast<sal_uInt32>( m_xColor->GetSelectEntryColor().GetRGBColor() ) ) }
+        { "Text", css::uno::Any( sText ) },
+        { "Font", css::uno::Any( m_xFont->get_active_text() ) },
+        { "Angle", css::uno::Any( static_cast<sal_Int16>( m_xAngle->get_value(FieldUnit::DEGREE) ) ) },
+        { "Transparency", css::uno::Any( static_cast<sal_Int16>( m_xTransparency->get_value(FieldUnit::PERCENT) ) ) },
+        { "Color", css::uno::Any( static_cast<sal_uInt32>( m_xColor->GetSelectEntryColor().GetRGBColor() ) ) }
     } ) );
     comphelper::dispatchCommand( ".uno:Watermark", aPropertyValues );
 
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 43cd6bba9717..2e81d7495a43 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3251,7 +3251,7 @@ bool SwTransferable::PasteDBData( const TransferableDataHelper& rData,
             {
                 pConnectionItem.reset(new SfxUnoAnyItem(FN_DB_CONNECTION_ANY, aDesc[DataAccessDescriptorProperty::Connection]));
                 pColumnItem.reset(new SfxUnoAnyItem(FN_DB_COLUMN_ANY, aDesc[DataAccessDescriptorProperty::ColumnObject]));
-                pSourceItem.reset(new SfxUnoAnyItem(FN_DB_DATA_SOURCE_ANY, makeAny(aDesc.getDataSource())));
+                pSourceItem.reset(new SfxUnoAnyItem(FN_DB_DATA_SOURCE_ANY, Any(aDesc.getDataSource())));
                 pCommandItem.reset(new SfxUnoAnyItem(FN_DB_DATA_COMMAND_ANY, aDesc[DataAccessDescriptorProperty::Command]));
                 pCommandTypeItem.reset(new SfxUnoAnyItem(FN_DB_DATA_COMMAND_TYPE_ANY, aDesc[DataAccessDescriptorProperty::CommandType]));
                 pColumnNameItem.reset(new SfxUnoAnyItem(FN_DB_DATA_COLUMN_NAME_ANY, aDesc[DataAccessDescriptorProperty::ColumnName]));
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 68855b28f1b5..e7c6a950bb76 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -557,7 +557,7 @@ SwSpellPopup::SwSpellPopup(
     checkRedline();
     m_xPopupMenu->RemoveDisabledEntries(true);
 
-    SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( true ));
+    SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::Any( true ));
 
     InitItemCommands(rSuggestions);
 }
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 280e667eaf2c..815b353d825c 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -291,28 +291,28 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                     if ( pMarginItem )
                         aMargin = pMarginItem->GetSize();
 
-                    xSet->setPropertyValue("FrameURL", uno::makeAny( pURLItem->GetValue() ) );
+                    xSet->setPropertyValue("FrameURL", uno::Any( pURLItem->GetValue() ) );
                     if ( pNameItem )
-                        xSet->setPropertyValue("FrameName", uno::makeAny( pNameItem->GetValue() ) );
+                        xSet->setPropertyValue("FrameName", uno::Any( pNameItem->GetValue() ) );
 
                     if ( eScroll == ScrollingMode::Auto )
                         xSet->setPropertyValue("FrameIsAutoScroll",
-                            uno::makeAny( true ) );
+                            uno::Any( true ) );
                     else
                         xSet->setPropertyValue("FrameIsScrollingMode",
-                            uno::makeAny( eScroll == ScrollingMode::Yes ) );
+                            uno::Any( eScroll == ScrollingMode::Yes ) );
 
                     if ( pBorderItem )
                         xSet->setPropertyValue("FrameIsBorder",
-                            uno::makeAny( pBorderItem->GetValue() ) );
+                            uno::Any( pBorderItem->GetValue() ) );
 
                     if ( pMarginItem )
                     {
                         xSet->setPropertyValue("FrameMarginWidth",
-                            uno::makeAny( sal_Int32( aMargin.Width() ) ) );
+                            uno::Any( sal_Int32( aMargin.Width() ) ) );
 
                         xSet->setPropertyValue("FrameMarginHeight",
-                            uno::makeAny( sal_Int32( aMargin.Height() ) ) );
+                            uno::Any( sal_Int32( aMargin.Height() ) ) );
                     }
                 }
                 catch (const uno::Exception&)
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index f6488f384344..72a9238c7c66 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -408,7 +408,7 @@ static void MetadataToTreeNode(const css::uno::Reference<css::uno::XInterface>&
     aCurNode.NodeType = svx::sidebar::TreeNode::ComplexProperty;
 
     aCurNode.children.push_back(
-        SimplePropToTreeNode("xml:id", uno::makeAny(xMeta->getMetadataReference().Second)));
+        SimplePropToTreeNode("xml:id", uno::Any(xMeta->getMetadataReference().Second)));
 
     // list associated (predicate, object) pairs of the actual subject
     // under the tree node "Metadata Reference"
@@ -420,7 +420,7 @@ static void MetadataToTreeNode(const css::uno::Reference<css::uno::XInterface>&
     std::map<OUString, OUString> xStatements
         = SwRDFHelper::getStatements(pDocSh->GetBaseModel(), xRepo->getGraphNames(), xSubject);
     for (const auto& pair : xStatements)
-        aCurNode.children.push_back(SimplePropToTreeNode(pair.first, uno::makeAny(pair.second)));
+        aCurNode.children.push_back(SimplePropToTreeNode(pair.first, uno::Any(pair.second)));
 
     rNode.children.push_back(aCurNode);
 }
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 2fcea5f285f5..a1b18fedac28 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -200,7 +200,7 @@ SwInsertChart::SwInsertChart( const Link<css::ui::dialogs::DialogClosedEvent*, v
                         tools::Rectangle aRect( aSwRect.SVRect() );
                         Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect );
                         xDialogProps->setPropertyValue("Position",
-                            uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
+                            uno::Any( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
                     }
                 }
             }
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index e062a305a279..854fa30ab6ce 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -296,16 +296,16 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
         uno::Sequence< beans::PropertyValue > aArgs{
             beans::PropertyValue(
                 "CellRangeRepresentation", -1,
-                uno::makeAny( rCellRange ), beans::PropertyState_DIRECT_VALUE ),
+                uno::Any( rCellRange ), beans::PropertyState_DIRECT_VALUE ),
             beans::PropertyValue(
                 "HasCategories", -1,
-                uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ),
+                uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE ),
             beans::PropertyValue(
                 "FirstCellAsLabel", -1,
-                uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ),
+                uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ),
             beans::PropertyValue(
                 "DataRowSource", -1,
-                uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE )
+                uno::Any( eDataRowSource ), beans::PropertyState_DIRECT_VALUE )
         };
         xDataReceiver->setArguments( aArgs );
     }
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 1a80e02bb5a6..fefada834a84 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -552,7 +552,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
         pOpt->SetOnlineSpell(bSet);
         {
             SvtLinguConfig  aCfg;
-            aCfg.SetProperty( UPN_IS_SPELL_AUTO, uno::makeAny( bSet ) );
+            aCfg.SetProperty( UPN_IS_SPELL_AUTO, uno::Any( bSet ) );
 
             if (xLngProp.is())
                 xLngProp->setIsSpellAuto( bSet );
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 910fea4e1bf2..2cb38325ba67 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -323,7 +323,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
     uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY);
     if(nHtmlMode & HTMLMODE_ON)
     {
-        xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, makeAny(true));
+        xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, Any(true));
         xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, false);
     }
 
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 9b0a3d7e6a93..3804354a7521 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -108,7 +108,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
     if ( !xGroup.is() )
         throw container::NoSuchElementException();
 
-    return makeAny( xGroup );
+    return css::uno::Any( xGroup );
 }
 
 uno::Sequence< OUString > SwXAutoTextContainer::getElementNames()
@@ -513,7 +513,7 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName)
     uno::Reference< text::XAutoTextEntry > xEntry = m_pGlossaries->GetAutoTextEntry( m_sGroupName, m_sName, _rName );
     OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::getByName: GetAutoTextEntry is fractious!" );
         // we told it to create the object, so why didn't it?
-    return makeAny( xEntry );
+    return css::uno::Any( xEntry );
 }
 
 uno::Sequence< OUString > SwXAutoTextGroup::getElementNames()
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index e21810038ccc..0c7f465806d9 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -220,7 +220,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
     }
     else if(aURL.Complete == cURLFormLetter)
     {
-        SfxUnoAnyItem aDBProperties(FN_PARAM_DATABASE_PROPERTIES, uno::makeAny(aArgs));
+        SfxUnoAnyItem aDBProperties(FN_PARAM_DATABASE_PROPERTIES, uno::Any(aArgs));
         m_pView->GetViewFrame()->GetDispatcher()->ExecuteList(
             FN_MAILMERGE_WIZARD,
             SfxCallMode::ASYNCHRON,
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 203879289a9b..89aa97861017 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -620,13 +620,13 @@ uno::Any SAL_CALL SwXMailMerge::execute(
             if (xRowSetPropSet.is())
             {
                 if (xCurConnection.is())
-                    xRowSetPropSet->setPropertyValue( "ActiveConnection",  makeAny( xCurConnection ) );
-                xRowSetPropSet->setPropertyValue( "DataSourceName",    makeAny( aCurDataSourceName ) );
-                xRowSetPropSet->setPropertyValue( "Command",           makeAny( aCurDataCommand ) );
-                xRowSetPropSet->setPropertyValue( "CommandType",       makeAny( nCurDataCommandType ) );
-                xRowSetPropSet->setPropertyValue( "EscapeProcessing",  makeAny( bCurEscapeProcessing ) );
-                xRowSetPropSet->setPropertyValue( "ApplyFilter",       makeAny( true ) );
-                xRowSetPropSet->setPropertyValue( "Filter",            makeAny( aCurFilter ) );
+                    xRowSetPropSet->setPropertyValue( "ActiveConnection",  Any( xCurConnection ) );
+                xRowSetPropSet->setPropertyValue( "DataSourceName",    Any( aCurDataSourceName ) );
+                xRowSetPropSet->setPropertyValue( "Command",           Any( aCurDataCommand ) );
+                xRowSetPropSet->setPropertyValue( "CommandType",       Any( nCurDataCommandType ) );
+                xRowSetPropSet->setPropertyValue( "EscapeProcessing",  Any( bCurEscapeProcessing ) );
+                xRowSetPropSet->setPropertyValue( "ApplyFilter",       Any( true ) );
+                xRowSetPropSet->setPropertyValue( "Filter",            Any( aCurFilter ) );
 
                 Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY );
                 if (xRowSet.is())
@@ -814,10 +814,10 @@ uno::Any SAL_CALL SwXMailMerge::execute(
 
     if (DBMGR_MERGE_SHELL == nMergeType)
     {
-        return makeAny( aMergeDesc.pMailMergeConfigItem->GetTargetView()->GetDocShell()->GetBaseModel() );
+        return Any( aMergeDesc.pMailMergeConfigItem->GetTargetView()->GetDocShell()->GetBaseModel() );
     }
     else
-        return makeAny( true );
+        return Any( true );
 }
 
 void SAL_CALL SwXMailMerge::cancel()
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 31ec42ff75ea..2246aee9331a 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -74,7 +74,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie
 
     //To reproduce this problem, in edit->autotext and click through
     //the examples and see if the preview gets a horizontal scrollbar
-    uno::Any aFalseSet(uno::makeAny(false));
+    uno::Any aFalseSet(uno::Any(false));
     xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, aFalseSet);
 
     xViewProps->setPropertyValue(UNO_NAME_SHOW_HORI_SCROLL_BAR, aFalseSet);
@@ -82,7 +82,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie
 
     if (bEnableOnlineMode)
     {
-        xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::makeAny(true));
+        xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::Any(true));
     }
 }
 
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 32d515de2217..ca1c55c0f8c7 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -534,7 +534,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame
                 {
                     try
                     {
-                        xSet->setPropertyValue("Formula", uno::makeAny( aMathData ) );
+                        xSet->setPropertyValue("Formula", uno::Any( aMathData ) );
                         bActivate = false;
                     }
                     catch (const uno::Exception&)
@@ -598,9 +598,9 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame
                  bDisableDataTableDialog )
             {
                 xProps->setPropertyValue("DisableDataTableDialog",
-                    uno::makeAny( false ) );
+                    uno::Any( false ) );
                 xProps->setPropertyValue("DisableComplexChartTypes",
-                    uno::makeAny( false ) );
+                    uno::Any( false ) );
                 uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY );
                 if ( xModifiable.is() )
                 {
@@ -659,7 +659,7 @@ void SwWrtShell::LaunchOLEObj(sal_Int32 nVerb)
     {
         uno::Sequence<beans::PropertyValue> aArguments
             = { comphelper::makePropertyValue("ReadOnly", pCli->IsProtected()) };
-        xOLEInit->initialize({ uno::makeAny(aArguments) });
+        xOLEInit->initialize({ uno::Any(aArguments) });
     }
 
     static_cast<SwOleClient*>(pCli)->SetInDoVerb( true );