Just use Any ctor instead of makeAny (Linux, sequel)

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

15 files changed, 128 insertions, 128 deletions

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 8e556800871b..a5554dd065d0 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -549,7 +549,7 @@ Any SAL_CALL OCommonStatement::getWarnings(  )
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
 
 
-    return makeAny(SQLWarning());
+    return Any(SQLWarning());
 }
 
 
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 1aff45ab0cde..038ea2db6aca 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -603,9 +603,9 @@ void DesktopLOKTest::testSearchCalc()
 
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {"SearchItem.SearchString", uno::makeAny(OUString("foo"))},
-        {"SearchItem.Backward", uno::makeAny(false)},
-        {"SearchItem.Command", uno::makeAny(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
+        {"SearchItem.SearchString", uno::Any(OUString("foo"))},
+        {"SearchItem.Backward", uno::Any(false)},
+        {"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
     }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -634,9 +634,9 @@ void DesktopLOKTest::testSearchAllNotificationsCalc()
 
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {"SearchItem.SearchString", uno::makeAny(OUString("foo"))},
-        {"SearchItem.Backward", uno::makeAny(false)},
-        {"SearchItem.Command", uno::makeAny(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
+        {"SearchItem.SearchString", uno::Any(OUString("foo"))},
+        {"SearchItem.Backward", uno::Any(false)},
+        {"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
     }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -776,7 +776,7 @@ void DesktopLOKTest::testPasteWriterJPEG()
     uno::Reference<lang::XComponent>(xShape, uno::UNO_QUERY_THROW)->dispose();
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {"AnchorType", uno::makeAny(static_cast<sal_uInt16>(text::TextContentAnchorType_AT_CHARACTER))},
+        {"AnchorType", uno::Any(static_cast<sal_uInt16>(text::TextContentAnchorType_AT_CHARACTER))},
     }));
     comphelper::dispatchCommand(".uno:Paste", aPropertyValues);
     xShape.set(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -2112,7 +2112,7 @@ void DesktopLOKTest::testRedlineWriter()
     // Load a Writer document, enable change recording and press a key.
     LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
     pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 't', 0);
     Scheduler::ProcessEventsToIdle();
@@ -2139,7 +2139,7 @@ void DesktopLOKTest::testRedlineCalc()
     // Load a Writer document, enable change recording and press a key.
     LibLODocument_Impl* pDocument = loadDoc("sheets.ods");
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
     pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 't', 0);
     pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 296e2703ef87..36c180efb15b 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -776,7 +776,7 @@ void ScTiledRenderingTest::testSpellOnlineRenderParameter()
 
     uno::Sequence<beans::PropertyValue> aPropertyValues =
     {
-        comphelper::makePropertyValue(".uno:SpellOnline", uno::makeAny(!bSet)),
+        comphelper::makePropertyValue(".uno:SpellOnline", uno::Any(!bSet)),
     };
     pModelObj->initializeForTiledRendering(aPropertyValues);
 
@@ -880,9 +880,9 @@ void ScTiledRenderingTest::testMoveShapeHandle()
         sal_uInt32 oldY = y;
         uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
         {
-            {"HandleNum", uno::makeAny(id)},
-            {"NewPosX", uno::makeAny(x+1)},
-            {"NewPosY", uno::makeAny(y+1)}
+            {"HandleNum", uno::Any(id)},
+            {"NewPosX", uno::Any(x+1)},
+            {"NewPosY", uno::Any(y+1)}
         }));
         comphelper::dispatchCommand(".uno:MoveShapeHandle", aPropertyValues);
         Scheduler::ProcessEventsToIdle();
@@ -1270,8 +1270,8 @@ void ScTiledRenderingTest::testCommentCallback()
         // Add a new comment
         uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
         {
-            {"Text", uno::makeAny(OUString("Comment"))},
-            {"Author", uno::makeAny(OUString("LOK User1"))},
+            {"Text", uno::Any(OUString("Comment"))},
+            {"Author", uno::Any(OUString("LOK User1"))},
         }));
         comphelper::dispatchCommand(".uno:InsertAnnotation", aArgs);
         Scheduler::ProcessEventsToIdle();
@@ -1300,9 +1300,9 @@ void ScTiledRenderingTest::testCommentCallback()
             pTabViewShell->SetCursor(3, 100);
         aArgs = comphelper::InitPropertySequence(
         {
-            {"Id", uno::makeAny(OUString::createFromAscii(aCommentId.c_str()))},
-            {"Text", uno::makeAny(OUString("Edited comment"))},
-            {"Author", uno::makeAny(OUString("LOK User2"))},
+            {"Id", uno::Any(OUString::createFromAscii(aCommentId.c_str()))},
+            {"Text", uno::Any(OUString("Edited comment"))},
+            {"Author", uno::Any(OUString("LOK User2"))},
         });
         comphelper::dispatchCommand(".uno:EditAnnotation", aArgs);
         Scheduler::ProcessEventsToIdle();
@@ -1324,7 +1324,7 @@ void ScTiledRenderingTest::testCommentCallback()
             pTabViewShell->SetCursor(4, 43);
         aArgs = comphelper::InitPropertySequence(
         {
-            {"Id", uno::makeAny(OUString::createFromAscii(aCommentId.c_str()))}
+            {"Id", uno::Any(OUString::createFromAscii(aCommentId.c_str()))}
         });
         comphelper::dispatchCommand(".uno:DeleteNote", aArgs);
         Scheduler::ProcessEventsToIdle();
@@ -1441,7 +1441,7 @@ void ScTiledRenderingTest::testUndoRepairDispatch()
     SfxLokHelper::setView(nView2);
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {"Repair", uno::makeAny(true)}
+        {"Repair", uno::Any(true)}
     }));
     comphelper::dispatchCommand(".uno:Undo", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -1855,7 +1855,7 @@ void ScTiledRenderingTest::testSpellOnlineParameter()
 
     uno::Sequence<beans::PropertyValue> params =
     {
-        comphelper::makePropertyValue("Enable", uno::makeAny(!bSet)),
+        comphelper::makePropertyValue("Enable", uno::Any(!bSet)),
     };
     dispatchCommand(mxComponent, ".uno:SpellOnline", params);
     CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
@@ -1863,7 +1863,7 @@ void ScTiledRenderingTest::testSpellOnlineParameter()
     // set the same state as now and we don't expect any change (no-toggle)
     params =
     {
-        comphelper::makePropertyValue("Enable", uno::makeAny(!bSet)),
+        comphelper::makePropertyValue("Enable", uno::Any(!bSet)),
     };
     dispatchCommand(mxComponent, ".uno:SpellOnline", params);
     CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
@@ -2873,8 +2873,8 @@ void ScTiledRenderingTest::testCommentCellCopyPaste()
         // Add a new comment
         uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
         {
-            {"Text", uno::makeAny(OUString("LOK Comment Cell B2"))},
-            {"Author", uno::makeAny(OUString("LOK Client"))},
+            {"Text", uno::Any(OUString("LOK Comment Cell B2"))},
+            {"Author", uno::Any(OUString("LOK Client"))},
         }));
         comphelper::dispatchCommand(".uno:InsertAnnotation", aArgs);
         Scheduler::ProcessEventsToIdle();
diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index aebf5d19a419..12b83754dbd6 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -135,9 +135,9 @@ void lcl_search(const OUString& rKey, bool bFindAll = false, bool bBackwards = f
     SvxSearchCmd eSearch = bFindAll ? SvxSearchCmd::FIND_ALL : SvxSearchCmd::FIND;
 
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({
-        { "SearchItem.SearchString", uno::makeAny(rKey) },
-        { "SearchItem.Backward", uno::makeAny(bBackwards) },
-        { "SearchItem.Command", uno::makeAny(sal_uInt16(eSearch)) },
+        { "SearchItem.SearchString", uno::Any(rKey) },
+        { "SearchItem.Backward", uno::Any(bBackwards) },
+        { "SearchItem.Command", uno::Any(sal_uInt16(eSearch)) },
     }));
 
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
@@ -151,9 +151,9 @@ void lcl_replace(const OUString& rKey, const OUString& rReplace, bool bAll = fal
     SvxSearchCmd eSearch = bAll ? SvxSearchCmd::REPLACE_ALL : SvxSearchCmd::REPLACE;
 
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({
-        { "SearchItem.SearchString", uno::makeAny(rKey) },
-        { "SearchItem.ReplaceString", uno::makeAny(rReplace) },
-        { "SearchItem.Command", uno::makeAny(sal_uInt16(eSearch)) },
+        { "SearchItem.SearchString", uno::Any(rKey) },
+        { "SearchItem.ReplaceString", uno::Any(rReplace) },
+        { "SearchItem.Command", uno::Any(sal_uInt16(eSearch)) },
     }));
 
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 9ce85a102f83..7bfb30a7a544 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -580,8 +580,8 @@ void SdTiledRenderingTest::testUndoShells()
     SdXImpressDocument* pXImpressDocument = createDoc("shape.odp");
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {"AttributePageSize.Width", uno::makeAny(static_cast<sal_Int32>(10000))},
-        {"AttributePageSize.Height", uno::makeAny(static_cast<sal_Int32>(10000))},
+        {"AttributePageSize.Width", uno::Any(static_cast<sal_Int32>(10000))},
+        {"AttributePageSize.Height", uno::Any(static_cast<sal_Int32>(10000))},
     }));
     comphelper::dispatchCommand(".uno:AttributePageSize", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -738,8 +738,8 @@ void SdTiledRenderingTest::testInsertTable()
 
     uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
     {
-        { "Rows", uno::makeAny(sal_Int32(3)) },
-        { "Columns", uno::makeAny(sal_Int32(5)) }
+        { "Rows", uno::Any(sal_Int32(3)) },
+        { "Columns", uno::Any(sal_Int32(5)) }
     }));
 
     comphelper::dispatchCommand(".uno:InsertTable", aArgs);
@@ -764,8 +764,8 @@ void SdTiledRenderingTest::testDeleteTable()
 
     uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
     {
-        { "Rows", uno::makeAny(sal_Int32(3)) },
-        { "Columns", uno::makeAny(sal_Int32(5)) }
+        { "Rows", uno::Any(sal_Int32(3)) },
+        { "Columns", uno::Any(sal_Int32(5)) }
     }));
 
     comphelper::dispatchCommand(".uno:InsertTable", aArgs);
@@ -1802,7 +1802,7 @@ void SdTiledRenderingTest::testCommentCallbacks()
 
     SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp", comphelper::InitPropertySequence(
     {
-        {".uno:Author", uno::makeAny(OUString("LOK User1"))},
+        {".uno:Author", uno::Any(OUString("LOK User1"))},
     }));
     ViewCallback aView1;
     int nView1 = SfxLokHelper::getView();
@@ -1810,7 +1810,7 @@ void SdTiledRenderingTest::testCommentCallbacks()
     SfxLokHelper::createView();
     uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
     {
-        {".uno:Author", uno::makeAny(OUString("LOK User2"))},
+        {".uno:Author", uno::Any(OUString("LOK User2"))},
     }));
     pXImpressDocument->initializeForTiledRendering(aArgs);
     ViewCallback aView2;
@@ -1821,7 +1821,7 @@ void SdTiledRenderingTest::testCommentCallbacks()
     // Add a new comment
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Text", uno::makeAny(OUString("Comment"))},
+        {"Text", uno::Any(OUString("Comment"))},
     });
     comphelper::dispatchCommand(".uno:InsertAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1845,8 +1845,8 @@ void SdTiledRenderingTest::testCommentCallbacks()
     SfxLokHelper::setView(nView2);
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Id", uno::makeAny(OUString::number(nComment1))},
-        {"Text", uno::makeAny(OUString("Reply to comment"))},
+        {"Id", uno::Any(OUString::number(nComment1))},
+        {"Text", uno::Any(OUString("Reply to comment"))},
     });
     comphelper::dispatchCommand(".uno:ReplyToAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1870,8 +1870,8 @@ void SdTiledRenderingTest::testCommentCallbacks()
     // Edit this annotation now
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Id", uno::makeAny(OUString::number(nComment1))},
-        {"Text", uno::makeAny(OUString("Edited comment"))},
+        {"Id", uno::Any(OUString::number(nComment1))},
+        {"Text", uno::Any(OUString("Edited comment"))},
     });
     comphelper::dispatchCommand(".uno:EditAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1889,7 +1889,7 @@ void SdTiledRenderingTest::testCommentCallbacks()
     // Delete the comment
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Id", uno::makeAny(OUString::number(nComment1))},
+        {"Id", uno::Any(OUString::number(nComment1))},
     });
     comphelper::dispatchCommand(".uno:DeleteAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1913,7 +1913,7 @@ void SdTiledRenderingTest::testCommentChangeImpress()
 
     createDoc("dummy.odp", comphelper::InitPropertySequence(
     {
-        {".uno:Author", uno::makeAny(OUString("LOK User1"))},
+        {".uno:Author", uno::Any(OUString("LOK User1"))},
     }));
 
     ViewCallback aView1;
@@ -1921,7 +1921,7 @@ void SdTiledRenderingTest::testCommentChangeImpress()
     // Add a new comment
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Text", uno::makeAny(OUString("Comment"))},
+        {"Text", uno::Any(OUString("Comment"))},
     });
     comphelper::dispatchCommand(".uno:InsertAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1937,9 +1937,9 @@ void SdTiledRenderingTest::testCommentChangeImpress()
     // Edit this annotation now
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Id", uno::makeAny(OUString::number(nComment1))},
-        {"PositionX", uno::makeAny(sal_Int32(10))},
-        {"PositionY", uno::makeAny(sal_Int32(20))}
+        {"Id", uno::Any(OUString::number(nComment1))},
+        {"PositionX", uno::Any(sal_Int32(10))},
+        {"PositionY", uno::Any(sal_Int32(20))}
     });
     comphelper::dispatchCommand(".uno:EditAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1961,7 +1961,7 @@ void SdTiledRenderingTest::testCommentChangeDraw()
 
     createDoc("dummy.odg", comphelper::InitPropertySequence(
     {
-        {".uno:Author", uno::makeAny(OUString("LOK User1"))},
+        {".uno:Author", uno::Any(OUString("LOK User1"))},
     }));
 
     ViewCallback aView1;
@@ -1969,7 +1969,7 @@ void SdTiledRenderingTest::testCommentChangeDraw()
     // Add a new comment
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Text", uno::makeAny(OUString("Comment"))},
+        {"Text", uno::Any(OUString("Comment"))},
     });
     comphelper::dispatchCommand(".uno:InsertAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -1985,9 +1985,9 @@ void SdTiledRenderingTest::testCommentChangeDraw()
     // Edit this annotation now
     aArgs = comphelper::InitPropertySequence(
     {
-        {"Id", uno::makeAny(OUString::number(nComment1))},
-        {"PositionX", uno::makeAny(sal_Int32(10))},
-        {"PositionY", uno::makeAny(sal_Int32(20))}
+        {"Id", uno::Any(OUString::number(nComment1))},
+        {"PositionX", uno::Any(sal_Int32(10))},
+        {"PositionY", uno::Any(sal_Int32(20))}
     });
     comphelper::dispatchCommand(".uno:EditAnnotation", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -2267,7 +2267,7 @@ void SdTiledRenderingTest::testLanguageAllText()
 
     // Set the language to English for all text.
     uno::Sequence<beans::PropertyValue> aArgs = comphelper::InitPropertySequence({
-        { "Language", uno::makeAny(OUString("Default_English (USA)")) },
+        { "Language", uno::Any(OUString("Default_English (USA)")) },
     });
     comphelper::dispatchCommand(".uno:LanguageStatus", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -2361,7 +2361,7 @@ void SdTiledRenderingTest::testTdf115783()
     pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, nShiftRight);
     pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, nShiftRight);
     uno::Sequence<beans::PropertyValue> aArgs = comphelper::InitPropertySequence({
-        { "FontHeight.Height", uno::makeAny(static_cast<float>(12)) },
+        { "FontHeight.Height", uno::Any(static_cast<float>(12)) },
     });
     comphelper::dispatchCommand(".uno:FontHeight", aArgs);
     Scheduler::ProcessEventsToIdle();
@@ -2619,7 +2619,7 @@ void SdTiledRenderingTest::testSpellOnlineRenderParameter()
 
     uno::Sequence<beans::PropertyValue> aPropertyValues =
     {
-        comphelper::InitPropertySequence({ { ".uno:SpellOnline", uno::makeAny(!bSet) } }),
+        comphelper::InitPropertySequence({ { ".uno:SpellOnline", uno::Any(!bSet) } }),
     };
     pXImpressDocument->initializeForTiledRendering(aPropertyValues);
     CPPUNIT_ASSERT_EQUAL(!bSet, pXImpressDocument->GetDoc()->GetOnlineSpell());
@@ -2715,9 +2715,9 @@ void SdTiledRenderingTest::testMoveShapeHandle()
         sal_uInt32 oldY = y;
         uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
         {
-            {"HandleNum", uno::makeAny(id)},
-            {"NewPosX", uno::makeAny(x+1)},
-            {"NewPosY", uno::makeAny(y+1)}
+            {"HandleNum", uno::Any(id)},
+            {"NewPosX", uno::Any(x+1)},
+            {"NewPosY", uno::Any(y+1)}
         }));
         comphelper::dispatchCommand(".uno:MoveShapeHandle", aPropertyValues);
         Scheduler::ProcessEventsToIdle();
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 8d6a5615e6ba..4dcc91967cba 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -248,7 +248,7 @@ css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
          PropertyName == "givenname" ||
          PropertyName == "sn" )
     {
-        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+        return css::uno::Any(css::beans::Optional< css::uno::Any >());
     }
 
     throw css::beans::UnknownPropertyException(
diff --git a/shell/source/backends/kf5be/kf5access.cxx b/shell/source/backends/kf5be/kf5access.cxx
index 67056ad5544b..bfb669cf2cbe 100644
--- a/shell/source/backends/kf5be/kf5access.cxx
+++ b/shell/source/backends/kf5be/kf5access.cxx
@@ -68,27 +68,27 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         else
             aClientProgram = aClientProgram.section(QLatin1Char(' '), 0, 0);
         sClientProgram = fromQStringToOUString(aClientProgram);
-        return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sClientProgram));
+        return css::beans::Optional<css::uno::Any>(true, uno::Any(sClientProgram));
     }
     else if (id == u"SourceViewFontHeight")
     {
         const QFont aFixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
         const short nFontHeight = aFixedFont.pointSize();
-        return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nFontHeight));
+        return css::beans::Optional<css::uno::Any>(true, uno::Any(nFontHeight));
     }
     else if (id == u"SourceViewFontName")
     {
         const QFont aFixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
         const QString aFontName = aFixedFont.family();
         const OUString sFontName = fromQStringToOUString(aFontName);
-        return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sFontName));
+        return css::beans::Optional<css::uno::Any>(true, uno::Any(sFontName));
     }
     else if (id == u"EnableATToolSupport")
     {
         /* does not make much sense without an accessibility bridge */
         bool ATToolSupport = false;
         return css::beans::Optional<css::uno::Any>(true,
-                                                   uno::makeAny(OUString::boolean(ATToolSupport)));
+                                                   uno::Any(OUString::boolean(ATToolSupport)));
     }
     else if (id == u"WorkPathVariable")
     {
@@ -101,7 +101,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
             aDocumentsDir.truncate(aDocumentsDir.length() - 1);
         sDocumentsDir = fromQStringToOUString(aDocumentsDir);
         osl_getFileURLFromSystemPath(sDocumentsDir.pData, &sDocumentsURL.pData);
-        return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sDocumentsURL));
+        return css::beans::Optional<css::uno::Any>(true, uno::Any(sDocumentsURL));
     }
     else if (id == u"ooInetFTPProxyName")
     {
@@ -127,7 +127,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aFTPProxy);
             OUString sProxy = fromQStringToOUString(aProxy.host());
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sProxy));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(sProxy));
         }
     }
     else if (id == u"ooInetFTPProxyPort")
@@ -154,7 +154,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aFTPProxy);
             sal_Int32 nPort = aProxy.port();
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nPort));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(nPort));
         }
     }
     else if (id == u"ooInetHTTPProxyName")
@@ -181,7 +181,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aHTTPProxy);
             OUString sProxy = fromQStringToOUString(aProxy.host());
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sProxy));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(sProxy));
         }
     }
     else if (id == u"ooInetHTTPProxyPort")
@@ -208,7 +208,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aHTTPProxy);
             sal_Int32 nPort = aProxy.port();
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nPort));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(nPort));
         }
     }
     else if (id == u"ooInetHTTPSProxyName")
@@ -235,7 +235,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aHTTPSProxy);
             OUString sProxy = fromQStringToOUString(aProxy.host());
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sProxy));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(sProxy));
         }
     }
     else if (id == u"ooInetHTTPSProxyPort")
@@ -262,7 +262,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
         {
             QUrl aProxy(aHTTPSProxy);
             sal_Int32 nPort = aProxy.port();
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nPort));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(nPort));
         }
     }
     else if (id == u"ooInetNoProxy")
@@ -285,7 +285,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
 
             aNoProxyFor = aNoProxyFor.replace(QLatin1Char(','), QLatin1Char(';'));
             sNoProxyFor = fromQStringToOUString(aNoProxyFor);
-            return css::beans::Optional<css::uno::Any>(true, uno::makeAny(sNoProxyFor));
+            return css::beans::Optional<css::uno::Any>(true, uno::Any(sNoProxyFor));
         }
     }
     else if (id == u"ooInetProxyType")
@@ -302,7 +302,7 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id)
             default: // No proxy is used
                 nProxyType = 0;
         }
-        return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nProxyType));
+        return css::beans::Optional<css::uno::Any>(true, uno::Any(nProxyType));
     }
     else
     {
diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
index 2b41414c54cd..7137a9999873 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -237,14 +237,14 @@ css::uno::Any Service::getPropertyValue(OUString const& PropertyName)
         std::map<OUString, css::beans::Optional<css::uno::Any>>::iterator it
             = m_KDESettings.find(PropertyName);
         if (it != m_KDESettings.end())
-            return css::uno::makeAny(it->second);
+            return css::uno::Any(it->second);
         else
-            return css::uno::makeAny(css::beans::Optional<css::uno::Any>());
+            return css::uno::Any(css::beans::Optional<css::uno::Any>());
     }
     else if (PropertyName == "givenname" || PropertyName == "sn"
              || PropertyName == "TemplatePathVariable")
     {
-        return css::uno::makeAny(css::beans::Optional<css::uno::Any>());
+        return css::uno::Any(css::beans::Optional<css::uno::Any>());
         //TODO: obtain values from KDE?
     }
     throw css::beans::UnknownPropertyException(PropertyName, static_cast<cppu::OWeakObject*>(this));
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 11a1df0d7be9..58e5562f3f5c 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -400,13 +400,13 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testGutterMarginPageBorder)
     uno::Reference<beans::XPropertySet> xStandard(getStyles("PageStyles")->getByName("Standard"),
                                                   uno::UNO_QUERY);
     sal_Int32 nGutterMm100 = 2000;
-    xStandard->setPropertyValue("GutterMargin", uno::makeAny(nGutterMm100));
+    xStandard->setPropertyValue("GutterMargin", uno::Any(nGutterMm100));
 
     // When setting a left border.
     table::BorderLine2 aBorder;
     aBorder.LineWidth = 2;
     aBorder.OuterLineWidth = 2;
-    xStandard->setPropertyValue("LeftBorder", uno::makeAny(aBorder));
+    xStandard->setPropertyValue("LeftBorder", uno::Any(aBorder));
 
     // Then make sure border is at the left edge of the text area.
     SwDocShell* pShell = pDoc->GetDocShell();
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index a55b6ce0bc92..97feed476bc2 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3602,9 +3602,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap)
     xShape->setSize(aSize);
     uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xDocument, uno::UNO_QUERY);
     uno::Reference<beans::XPropertySet> xShapeProperties(xShape, uno::UNO_QUERY);
-    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::Any(false));
     xShapeProperties->setPropertyValue("AnchorType",
-                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+                                       uno::Any(text::TextContentAnchorType_AT_CHARACTER));
     xDrawPageSupplier->getDrawPage()->add(xShape);
 
     aPoint = awt::Point(2000, 2000);
@@ -3612,9 +3612,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap)
     xShape->setPosition(aPoint);
     xShape->setSize(aSize);
     xShapeProperties.set(xShape, uno::UNO_QUERY);
-    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::Any(false));
     xShapeProperties->setPropertyValue("AnchorType",
-                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+                                       uno::Any(text::TextContentAnchorType_AT_CHARACTER));
     xDrawPageSupplier->getDrawPage()->add(xShape);
 
     // Now verify that the rectangle of the anchored objects don't overlap.
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 270dee370c66..c99b38aabef0 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -667,8 +667,8 @@ static void lcl_search(bool bBackward)
 {
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("shape"))},
-                {"SearchItem.Backward", uno::makeAny(bBackward)}
+                {"SearchItem.SearchString", uno::Any(OUString("shape"))},
+                {"SearchItem.Backward", uno::Any(bBackward)}
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
 }
@@ -728,10 +728,10 @@ void SwTiledRenderingTest::testSearchViewArea()
     pWrtShell->GotoPage(1, false);
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("Heading"))},
-                {"SearchItem.Backward", uno::makeAny(false)},
-                {"SearchItem.SearchStartPointX", uno::makeAny(static_cast<sal_Int32>(aPoint.getX()))},
-                {"SearchItem.SearchStartPointY", uno::makeAny(static_cast<sal_Int32>(aPoint.getY()))}
+                {"SearchItem.SearchString", uno::Any(OUString("Heading"))},
+                {"SearchItem.Backward", uno::Any(false)},
+                {"SearchItem.SearchStartPointX", uno::Any(static_cast<sal_Int32>(aPoint.getX()))},
+                {"SearchItem.SearchStartPointY", uno::Any(static_cast<sal_Int32>(aPoint.getY()))}
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This was just "Heading", i.e. SwView::SearchAndWrap() did not search from only the top of the second page.
@@ -745,8 +745,8 @@ void SwTiledRenderingTest::testSearchTextFrame()
     setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("TextFrame"))},
-                {"SearchItem.Backward", uno::makeAny(false)},
+                {"SearchItem.SearchString", uno::Any(OUString("TextFrame"))},
+                {"SearchItem.Backward", uno::Any(false)},
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This was empty: nothing was highlighted after searching for 'TextFrame'.
@@ -760,8 +760,8 @@ void SwTiledRenderingTest::testSearchTextFrameWrapAround()
     setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("TextFrame"))},
-                {"SearchItem.Backward", uno::makeAny(false)},
+                {"SearchItem.SearchString", uno::Any(OUString("TextFrame"))},
+                {"SearchItem.Backward", uno::Any(false)},
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     CPPUNIT_ASSERT(m_bFound);
@@ -794,9 +794,9 @@ void SwTiledRenderingTest::testSearchAll()
     setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("shape"))},
-                {"SearchItem.Backward", uno::makeAny(false)},
-                {"SearchItem.Command", uno::makeAny(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
+                {"SearchItem.SearchString", uno::Any(OUString("shape"))},
+                {"SearchItem.Backward", uno::Any(false)},
+                {"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This was 0; should be 2 results in the body text.
@@ -814,9 +814,9 @@ void SwTiledRenderingTest::testSearchAllNotifications()
     m_nSelectionBeforeSearchResult = 0;
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"SearchItem.SearchString", uno::makeAny(OUString("shape"))},
-                {"SearchItem.Backward", uno::makeAny(false)},
-                {"SearchItem.Command", uno::makeAny(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
+                {"SearchItem.SearchString", uno::Any(OUString("shape"))},
+                {"SearchItem.Backward", uno::Any(false)},
+                {"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
                 }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -832,7 +832,7 @@ void SwTiledRenderingTest::testPageDownInvalidation()
     SwXTextDocument* pXTextDocument = createDoc("pagedown-invalidation.odt");
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {".uno:HideWhitespace", uno::makeAny(true)},
+                {".uno:HideWhitespace", uno::Any(true)},
                 }));
     pXTextDocument->initializeForTiledRendering(aPropertyValues);
     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
@@ -1603,7 +1603,7 @@ void SwTiledRenderingTest::testUndoRepairDispatch()
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rUndoManager.GetUndoActionCount());
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"Repair", uno::makeAny(true)}
+                {"Repair", uno::Any(true)}
                 }));
     comphelper::dispatchCommand(".uno:Undo", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -1708,7 +1708,7 @@ void SwTiledRenderingTest::testTrackChanges()
 
     // Turn on track changes, type "zzz" at the end, and move to the start.
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
     ViewCallback aView(pWrtShell->GetSfxViewShell());
     pWrtShell->EndOfSection();
@@ -1723,7 +1723,7 @@ void SwTiledRenderingTest::testTrackChanges()
     // Reject the change by id, while the cursor does not cover the tracked change.
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
                 {
-                {"RejectTrackedChange", uno::makeAny(o3tl::narrowing<sal_uInt16>(pRedline->GetId()))}
+                {"RejectTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(pRedline->GetId()))}
                 }));
     comphelper::dispatchCommand(".uno:RejectTrackedChange", aPropertyValues);
     Scheduler::ProcessEventsToIdle();
@@ -1743,7 +1743,7 @@ void SwTiledRenderingTest::testTrackChangesCallback()
 
     // Turn on track changes and type "x".
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     m_nRedlineTableSizeChanged = 0;
     pWrtShell->Insert("x");
 
@@ -1770,7 +1770,7 @@ void SwTiledRenderingTest::testRedlineUpdateCallback()
 
     // Turn on track changes, type "xx" and delete the second one.
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     pWrtShell->Insert("xx");
     m_nRedlineTableEntryModified = 0;
     pWrtShell->DelLeft();
@@ -1781,7 +1781,7 @@ void SwTiledRenderingTest::testRedlineUpdateCallback()
 
     // Turn off the change tracking mode, make some modification to left of the
     // redline so that its position changes
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(false));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(false));
     pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
     pWrtShell->Insert("This text is left of the redline");
 
@@ -1890,7 +1890,7 @@ void SwTiledRenderingTest::testRedlineColors()
 
     // Turn on track changes, type "zzz" at the end.
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
     pWrtShell->EndOfSection();
     pWrtShell->Insert("zzz");
@@ -1959,8 +1959,8 @@ void SwTiledRenderingTest::testCommentInsert()
     uno::Reference<frame::XFrame> xFrame = pView->GetViewFrame()->GetFrame().GetFrameInterface();
     uno::Sequence<beans::PropertyValue> aPropertyValues = comphelper::InitPropertySequence(
             {
-            {"Text", uno::makeAny(OUString("some text"))},
-            {"Author", uno::makeAny(OUString("me"))},
+            {"Text", uno::Any(OUString("some text"))},
+            {"Author", uno::Any(OUString("me"))},
             });
     ViewCallback aView;
     comphelper::dispatchCommand(".uno:InsertAnnotation", xFrame, aPropertyValues);
@@ -2171,7 +2171,7 @@ void SwTiledRenderingTest::testAllTrackedChanges()
     createDoc("dummy.fodt");
 
     uno::Reference<beans::XPropertySet> xPropSet(mxComponent, uno::UNO_QUERY);
-    xPropSet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropSet->setPropertyValue("RecordChanges", uno::Any(true));
 
     // view #1
     SwView* pView1 = dynamic_cast<SwView*>(SfxViewShell::Current());
@@ -2396,7 +2396,7 @@ void SwTiledRenderingTest::testRedlineField()
 
     // Turn on track changes and type "x".
     uno::Reference<beans::XPropertySet> xPropertySet(mxComponent, uno::UNO_QUERY);
-    xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+    xPropertySet->setPropertyValue("RecordChanges", uno::Any(true));
 
     SwDateTimeField aDate(static_cast<SwDateTimeFieldType*>(pWrtShell->GetFieldType(0, SwFieldIds::DateTime)));
     //aDate->SetDateTime(::DateTime(::DateTime::SYSTEM));
@@ -3305,9 +3305,9 @@ void SwTiledRenderingTest::testMoveShapeHandle()
         sal_Int32 oldY = y;
         uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
         {
-            {"HandleNum", uno::makeAny(id)},
-            {"NewPosX", uno::makeAny(x+1)},
-            {"NewPosY", uno::makeAny(y+1)}
+            {"HandleNum", uno::Any(id)},
+            {"NewPosX", uno::Any(x+1)},
+            {"NewPosY", uno::Any(y+1)}
         }));
         comphelper::dispatchCommand(".uno:MoveShapeHandle", aPropertyValues);
         Scheduler::ProcessEventsToIdle();
@@ -3396,7 +3396,7 @@ void SwTiledRenderingTest::testSpellOnlineRenderParameter()
 
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
     {
-        {".uno:SpellOnline", uno::makeAny(!bSet)},
+        {".uno:SpellOnline", uno::Any(!bSet)},
     }));
     pXTextDocument->initializeForTiledRendering(aPropertyValues);
     CPPUNIT_ASSERT_EQUAL(!bSet, pOpt->IsOnlineSpell());
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 52509a361163..44037217882b 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -300,7 +300,7 @@ css::uno::Any Content::mapGIOError( GError *pError )
 
 css::uno::Any Content::getBadArgExcept()
 {
-    return css::uno::makeAny( css::lang::IllegalArgumentException(
+    return css::uno::Any( css::lang::IllegalArgumentException(
         "Wrong argument type!",
         static_cast< cppu::OWeakObject * >( this ), -1) );
 }
@@ -535,7 +535,7 @@ css::uno::Reference< css::sdbc::XRow > Content::getPropertyValues(
         }
         else if ( rProp.Name == "CreatableContentsInfo" )
         {
-            xRow->appendObject( rProp, css::uno::makeAny( queryCreatableContentsInfo( xEnv ) ) );
+            xRow->appendObject( rProp, css::uno::Any( queryCreatableContentsInfo( xEnv ) ) );
         }
         else
         {
@@ -876,7 +876,7 @@ css::uno::Any Content::open(const css::ucb::OpenCommandArgument2 & rOpenCommand,
     {
         css::uno::Sequence< css::uno::Any > aArgs{ css::uno::Any(
             m_xIdentifier->getContentIdentifier()) };
-        css::uno::Any aErr = css::uno::makeAny(
+        css::uno::Any aErr(
             css::ucb::InteractiveAugmentedIOException(OUString(), static_cast< cppu::OWeakObject * >( this ),
                 css::task::InteractionClassification_ERROR,
                 bIsFolder ? css::ucb::IOErrorCode_NOT_EXISTING_PATH : css::ucb::IOErrorCode_NOT_EXISTING, aArgs)
@@ -907,7 +907,7 @@ css::uno::Any Content::open(const css::ucb::OpenCommandArgument2 & rOpenCommand,
            )
         {
             ucbhelper::cancelCommandExecution(
-                css::uno::makeAny ( css::ucb::UnsupportedOpenModeException
+                css::uno::Any ( css::ucb::UnsupportedOpenModeException
                     ( OUString(), static_cast< cppu::OWeakObject * >( this ),
                       sal_Int16( rOpenCommand.Mode ) ) ),
                     xEnv );
@@ -921,7 +921,7 @@ css::uno::Any Content::open(const css::ucb::OpenCommandArgument2 & rOpenCommand,
             SAL_WARN("ucb.ucp.gio", "Failed to load data from '" << m_xIdentifier->getContentIdentifier() << "'");
 
             ucbhelper::cancelCommandExecution(
-                css::uno::makeAny (css::ucb::UnsupportedDataSinkException
+                css::uno::Any (css::ucb::UnsupportedDataSinkException
                     ( OUString(), static_cast< cppu::OWeakObject * >( this ),
                       rOpenCommand.Sink ) ),
                     xEnv );
@@ -1011,7 +1011,7 @@ css::uno::Any SAL_CALL Content::execute(
         SAL_WARN("ucb.ucp.gio", "Unknown command " << aCommand.Name);
 
         ucbhelper::cancelCommandExecution
-            ( css::uno::makeAny( css::ucb::UnsupportedCommandException
+            ( css::uno::Any( css::ucb::UnsupportedCommandException
               ( OUString(),
                 static_cast< cppu::OWeakObject * >( this ) ) ),
               xEnv );
@@ -1053,7 +1053,7 @@ void Content::insert(const css::uno::Reference< css::io::XInputStream > &xInputS
 
     if ( !xInputStream.is() )
     {
-        ucbhelper::cancelCommandExecution( css::uno::makeAny
+        ucbhelper::cancelCommandExecution( css::uno::Any
             ( css::ucb::MissingInputStreamException
               ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 54f9334a1607..f8358c6d85b0 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -258,7 +258,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868)
     uno::Reference<view::XPrintable> xPrintable(mxComponent, uno::UNO_QUERY);
     CPPUNIT_ASSERT(xPrintable.is());
     uno::Sequence<beans::PropertyValue> aOptions(comphelper::InitPropertySequence(
-        { { "FileName", uno::makeAny(maTempFile.GetURL()) }, { "Wait", uno::makeAny(true) } }));
+        { { "FileName", uno::Any(maTempFile.GetURL()) }, { "Wait", uno::Any(true) } }));
     xPrintable->print(aOptions);
 
     // Parse the export result with pdfium.
@@ -500,7 +500,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testSofthyphenPos)
     uno::Reference<view::XPrintable> xPrintable(mxComponent, uno::UNO_QUERY);
     CPPUNIT_ASSERT(xPrintable.is());
     uno::Sequence<beans::PropertyValue> aOptions(comphelper::InitPropertySequence(
-        { { "FileName", uno::makeAny(maTempFile.GetURL()) }, { "Wait", uno::makeAny(true) } }));
+        { { "FileName", uno::Any(maTempFile.GetURL()) }, { "Wait", uno::Any(true) } }));
     xPrintable->print(aOptions);
 
     // Parse the export result with pdfium.
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 470b12de490a..e00009cd1cf7 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1533,7 +1533,7 @@ void builder_add_from_gtk3_file(GtkBuilder* pBuilder, const OUString& rUri)
     css::uno::Reference<css::beans::XPropertySet> xTempFile(css::io::TempFile::create(xContext),
                                                             css::uno::UNO_QUERY_THROW);
     css::uno::Reference<css::io::XStream> xTempStream(xTempFile, css::uno::UNO_QUERY_THROW);
-    xTempFile->setPropertyValue("RemoveFile", css::uno::makeAny(false));
+    xTempFile->setPropertyValue("RemoveFile", css::uno::Any(false));
 
     // serialize it back to xml
     css::uno::Reference<css::xml::sax::XSAXSerializable> xSerializer(xDocument,
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 80c30a527949..4c9b84c3755e 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1482,9 +1482,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                     if ( xParagraph.is() )
                     {
                         xParagraph->setPropertyValue("ParaTopMargin",
-                                    uno::makeAny(static_cast<sal_Int32>(0)));
+                                    uno::Any(static_cast<sal_Int32>(0)));
                         xParagraph->setPropertyValue("ParaBottomMargin",
-                                    uno::makeAny(static_cast<sal_Int32>(0)));
+                                    uno::Any(static_cast<sal_Int32>(0)));
                     }
                 }