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>

7 files changed, 66 insertions, 66 deletions

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 18c72567c30e..6d1aaa9b37af 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -275,7 +275,7 @@ XMLRedlineImportHelper::XMLRedlineImportHelper(
     // set redline mode to "don't record changes"
     if( bHandleRecordChanges )
     {
-        m_xModelPropertySet->setPropertyValue( g_sRecordChanges, makeAny(false) );
+        m_xModelPropertySet->setPropertyValue( g_sRecordChanges, Any(false) );
     }
 }
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 234a802a4753..fb6fe1f1d733 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -303,7 +303,7 @@ ErrCode ReadThroughComponent(
     OSL_ENSURE( xInfoSet.is(), "missing property set" );
     if( xInfoSet.is() )
     {
-        xInfoSet->setPropertyValue( "StreamName", makeAny( sStreamName ) );
+        xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) );
     }
 
     try
@@ -642,7 +642,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
     xInfoSet->setPropertyValue("ProgressRange", aProgRange);
 
     Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW );
-    beans::NamedValue aLateInitSettings( "LateInitSettings", makeAny( xLateInitSettings ) );
+    beans::NamedValue aLateInitSettings( "LateInitSettings", Any( xLateInitSettings ) );
 
     xInfoSet->setPropertyValue( "SourceStorage", Any( xStorage ) );
 
@@ -684,16 +684,16 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
             *pSeq++ = "NumberingStyles";
 
         xInfoSet->setPropertyValue( "StyleInsertModeFamilies",
-                                    makeAny(aFamiliesSeq) );
+                                    Any(aFamiliesSeq) );
 
-        xInfoSet->setPropertyValue( "StyleInsertModeOverwrite", makeAny(!m_aOption.IsMerge()) );
+        xInfoSet->setPropertyValue( "StyleInsertModeOverwrite", Any(!m_aOption.IsMerge()) );
     }
     else if( m_bInsertMode )
     {
         const uno::Reference<text::XTextRange> xInsertTextRange =
             SwXTextRange::CreateXTextRange(rDoc, *rPaM.GetPoint(), nullptr);
         xInfoSet->setPropertyValue( "TextInsertModeRange",
-                                    makeAny(xInsertTextRange) );
+                                    Any(xInsertTextRange) );
     }
     else
     {
@@ -703,11 +703,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
 
     if( IsBlockMode() )
     {
-        xInfoSet->setPropertyValue( "AutoTextMode", makeAny(true) );
+        xInfoSet->setPropertyValue( "AutoTextMode", Any(true) );
     }
     if( IsOrganizerMode() )
     {
-        xInfoSet->setPropertyValue( "OrganizerMode", makeAny(true) );
+        xInfoSet->setPropertyValue( "OrganizerMode", Any(true) );
     }
 
     // Set base URI
@@ -716,7 +716,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
     SfxMedium* pMedDescrMedium = m_pMedium ? m_pMedium : pDocSh->GetMedium();
     OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!" );
 
-    xInfoSet->setPropertyValue( "BaseURI", makeAny( rBaseURL ) );
+    xInfoSet->setPropertyValue( "BaseURI", Any( rBaseURL ) );
 
     // TODO/LATER: separate links from usual embedded objects
     OUString StreamPath;
@@ -736,7 +736,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
 
         if( !StreamPath.isEmpty() )
         {
-            xInfoSet->setPropertyValue( "StreamRelPath", makeAny( StreamPath ) );
+            xInfoSet->setPropertyValue( "StreamRelPath", Any( StreamPath ) );
         }
     }
 
@@ -748,11 +748,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
     static const OUStringLiteral sRecordChanges(u"RecordChanges");
     static const OUStringLiteral sRedlineProtectionKey(u"RedlineProtectionKey");
     xInfoSet->setPropertyValue( sShowChanges,
-        makeAny(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
+        Any(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
     xInfoSet->setPropertyValue( sRecordChanges,
-        makeAny(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
+        Any(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
     xInfoSet->setPropertyValue( sRedlineProtectionKey,
-        makeAny(rDoc.getIDocumentRedlineAccess().GetRedlinePassword()) );
+        Any(rDoc.getIDocumentRedlineAccess().GetRedlinePassword()) );
 
     // force redline mode to "none"
     rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::NONE );
@@ -763,13 +763,13 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
         const bool bShapePositionInHoriL2R = !bOASIS;
         xInfoSet->setPropertyValue(
                 "ShapePositionInHoriL2R",
-                makeAny( bShapePositionInHoriL2R ) );
+                Any( bShapePositionInHoriL2R ) );
     }
     {
         const bool bTextDocInOOoFileFormat = !bOASIS;
         xInfoSet->setPropertyValue(
                 "TextDocInOOoFileFormat",
-                makeAny( bTextDocInOOoFileFormat ) );
+                Any( bTextDocInOOoFileFormat ) );
     }
 
     ErrCode nWarnRDF = ERRCODE_NONE;
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index bd9a4c4c8be5..6c553a6fc567 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -188,7 +188,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
 
     xInfoSet->setPropertyValue( "TargetStorage", Any( m_xStg ) );
 
-    xInfoSet->setPropertyValue("NoEmbDataSet", makeAny(bNoEmbDS));
+    xInfoSet->setPropertyValue("NoEmbDataSet", Any(bNoEmbDS));
 
     if (m_bShowProgress)
     {
@@ -204,7 +204,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
         xInfoSet->setPropertyValue("ProgressMax", Any(static_cast < sal_Int32 >( -1 )));
     }
 
-    xInfoSet->setPropertyValue( "UsePrettyPrinting", makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()) );
+    xInfoSet->setPropertyValue( "UsePrettyPrinting", Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get()) );
 
     uno::Reference<lang::XComponent> const xModelComp(m_pDoc->GetDocShell()->GetModel());
     uno::Reference<drawing::XDrawPageSupplier> const xDPS(xModelComp, uno::UNO_QUERY);
@@ -218,14 +218,14 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
     // TODO: ideally this would be stored per-view...
     SwRootFrame const*const pLayout(m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
     isShowChanges = pLayout == nullptr || !pLayout->IsHideRedlines();
-    xInfoSet->setPropertyValue("ShowChanges", makeAny(isShowChanges));
+    xInfoSet->setPropertyValue("ShowChanges", Any(isShowChanges));
     // ... and hide redlines for export
     nRedlineFlags &= ~RedlineFlags::ShowMask;
     nRedlineFlags |= RedlineFlags::ShowInsert;
     m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags );
 
     // Set base URI
-    xInfoSet->setPropertyValue( "BaseURI", makeAny( GetBaseURL() ) );
+    xInfoSet->setPropertyValue( "BaseURI", Any( GetBaseURL() ) );
 
     if( SfxObjectCreateMode::EMBEDDED == m_pDoc->GetDocShell()->GetCreateMode() )
     {
@@ -233,12 +233,12 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
             ? aDocHierarchicalName
             : OUString( "dummyObjectName" ) );
 
-        xInfoSet->setPropertyValue( "StreamRelPath", makeAny( aName ) );
+        xInfoSet->setPropertyValue( "StreamRelPath", Any( aName ) );
     }
 
     if( m_bBlock )
     {
-        xInfoSet->setPropertyValue( "AutoTextMode", makeAny(true) );
+        xInfoSet->setPropertyValue( "AutoTextMode", Any(true) );
     }
 
     // #i69627#
@@ -246,7 +246,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
     if ( bOASIS &&
          docfunc::HasOutlineStyleToBeWrittenAsNormalListStyle( *m_pDoc ) )
     {
-        xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( true ) );
+        xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", Any( true ) );
     }
 
     // filter arguments
@@ -508,7 +508,7 @@ bool SwXMLWriter::WriteThroughComponent(
         xSet->setPropertyValue("MediaType", Any(OUString("text/xml")) );
 
         // even plain stream should be encrypted in encrypted documents
-        xSet->setPropertyValue( "UseCommonStoragePasswordEncryption", makeAny(true) );
+        xSet->setPropertyValue( "UseCommonStoragePasswordEncryption", Any(true) );
 
         // set buffer and create outputstream
         uno::Reference< io::XOutputStream > xOutputStream = xStream->getOutputStream();
@@ -520,7 +520,7 @@ bool SwXMLWriter::WriteThroughComponent(
         OSL_ENSURE( xInfoSet.is(), "missing property set" );
         if( xInfoSet.is() )
         {
-            xInfoSet->setPropertyValue( "StreamName", makeAny( sStreamName ) );
+            xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) );
         }
 
         // write the stuff
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index d107828a2981..9f5ee3cf0dc1 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -333,7 +333,7 @@ SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
 
         try
         {
-            xPropSet->setPropertyValue(UNO_NAME_PARA_STYLE_CONDITIONS, uno::makeAny(aSeq));
+            xPropSet->setPropertyValue(UNO_NAME_PARA_STYLE_CONDITIONS, uno::Any(aSeq));
         }
         catch (uno::Exception const&)
         {
@@ -473,7 +473,7 @@ void SwXMLCellStyleContext::AddDataFormat()
     if (aIter != GetProperties().end())
         aIter->maValue <<= nNumberFormat;
     else
-        GetProperties().push_back(XMLPropertyState(nIndex, makeAny(nNumberFormat)));
+        GetProperties().push_back(XMLPropertyState(nIndex, Any(nNumberFormat)));
 }
 
 void SwXMLCellStyleContext::FillPropertySet(const css::uno::Reference<css::beans::XPropertySet>& rPropSet)
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 97d0d5bd385a..a3b7485fd9d3 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1431,42 +1431,42 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
 
     if( ! bAddExternalLeading )
     {
-        xProps->setPropertyValue( "AddExternalLeading", makeAny( false ) );
+        xProps->setPropertyValue( "AddExternalLeading", Any( false ) );
     }
 
     if( ! bUseFormerLineSpacing )
     {
-        xProps->setPropertyValue( "UseFormerLineSpacing", makeAny( true ) );
+        xProps->setPropertyValue( "UseFormerLineSpacing", Any( true ) );
     }
 
     if( !bUseFormerObjectPositioning )
     {
-        xProps->setPropertyValue( "UseFormerObjectPositioning", makeAny( true ) );
+        xProps->setPropertyValue( "UseFormerObjectPositioning", Any( true ) );
     }
 
     if( !bUseOldNumbering )
     {
-        xProps->setPropertyValue( "UseOldNumbering", makeAny(true) );
+        xProps->setPropertyValue( "UseOldNumbering", Any(true) );
     }
 
     if( !bAddParaSpacingToTableCells )
     {
         xProps->setPropertyValue( "AddParaSpacingToTableCells",
-            makeAny( false ) );
+            Any( false ) );
     }
     if (!bAddParaLineSpacingToTableCells)
     {
-        xProps->setPropertyValue("AddParaLineSpacingToTableCells", makeAny(false));
+        xProps->setPropertyValue("AddParaLineSpacingToTableCells", Any(false));
     }
 
     if( !bUseFormerTextWrapping )
     {
-        xProps->setPropertyValue( "UseFormerTextWrapping", makeAny( true ) );
+        xProps->setPropertyValue( "UseFormerTextWrapping", Any( true ) );
     }
 
     if (!bConsiderWrapOnObjPos && bAreUserSettingsFromDocument)
     {
-        xProps->setPropertyValue( "ConsiderTextWrapOnObjPos", makeAny( false ) );
+        xProps->setPropertyValue( "ConsiderTextWrapOnObjPos", Any( false ) );
     }
 
     // #i47448#
@@ -1483,40 +1483,40 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     if( !bIgnoreFirstLineIndentInNumbering && bDocumentPriorSO8 )
     {
         xProps->setPropertyValue( "IgnoreFirstLineIndentInNumbering",
-            makeAny( true ) );
+            Any( true ) );
     }
 
     // This flag has to be set for all documents < SO8
     if ( !bDoNotJustifyLinesWithManualBreak && bDocumentPriorSO8 )
     {
         xProps->setPropertyValue( "DoNotJustifyLinesWithManualBreak",
-            makeAny( true ) );
+            Any( true ) );
     }
 
     // This flag has to be set for all documents < SO8
     if ( !bDoNotResetParaAttrsForNumFont && bDocumentPriorSO8 )
     {
         xProps->setPropertyValue( "DoNotResetParaAttrsForNumFont",
-            makeAny( true ) );
+            Any( true ) );
     }
 
     // This flag has to be set for all documents < SO8
     if ( !bDoNotCaptureDrawObjsOnPage && bDocumentPriorSO8 )
     {
         xProps->setPropertyValue( "DoNotCaptureDrawObjsOnPage",
-            makeAny( true ) );
+            Any( true ) );
     }
 
     // This flag has to be set for all documents < SO8
     if ( !bClipAsCharacterAnchoredWriterFlyFrames && bDocumentPriorSO8 )
     {
         xProps->setPropertyValue( "ClipAsCharacterAnchoredWriterFlyFrames",
-            makeAny( true ) );
+            Any( true ) );
     }
 
     if ( !bUnixForceZeroExtLeading )
     {
-        xProps->setPropertyValue( "UnxForceZeroExtLeading", makeAny( true ) );
+        xProps->setPropertyValue( "UnxForceZeroExtLeading", Any( true ) );
     }
 
     // Old LO versions had 66 as the value for small caps percentage, later changed to 80.
@@ -1525,12 +1525,12 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     // are considered to be old files, so set the compatibility option too.
     if ( !bSmallCapsPercentage66 )
     {
-        xProps->setPropertyValue( "SmallCapsPercentage66", makeAny( true ) );
+        xProps->setPropertyValue( "SmallCapsPercentage66", Any( true ) );
     }
 
     if ( !bTabOverflow )
     {
-        xProps->setPropertyValue( "TabOverflow", makeAny( false ) );
+        xProps->setPropertyValue( "TabOverflow", Any( false ) );
     }
 
     if (bTabOverMarginValue)
@@ -1542,19 +1542,19 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
             uno::Any(document::PrinterIndependentLayout::HIGH_RESOLUTION));
 
     if (!bPropLineSpacingShrinksFirstLine)
-        xProps->setPropertyValue("PropLineSpacingShrinksFirstLine", makeAny(false));
+        xProps->setPropertyValue("PropLineSpacingShrinksFirstLine", Any(false));
 
     if (!bSubtractFlysAnchoredAtFlys && bAreUserSettingsFromDocument)
-        xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true));
+        xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", Any(true));
 
     if (!bEmptyDbFieldHidesPara && bAreUserSettingsFromDocument)
-        xProps->setPropertyValue("EmptyDbFieldHidesPara", makeAny(false));
+        xProps->setPropertyValue("EmptyDbFieldHidesPara", Any(false));
 
     if (!bCollapseEmptyCellPara)
-        xProps->setPropertyValue("CollapseEmptyCellPara", makeAny(false));
+        xProps->setPropertyValue("CollapseEmptyCellPara", Any(false));
 
     if (!bAutoFirstLineIndentDisregardLineSpace)
-        xProps->setPropertyValue("AutoFirstLineIndentDisregardLineSpace", makeAny(false));
+        xProps->setPropertyValue("AutoFirstLineIndentDisregardLineSpace", Any(false));
 
     SwDoc *pDoc = getDoc();
     SfxPrinter *pPrinter = pDoc->getIDocumentDeviceAccess().getPrinter( false );
@@ -1587,11 +1587,11 @@ void SwXMLImport::SetDocumentSpecificSettings(
     {
         if ( m_xLateInitSettings->hasByName( _rSettingsGroupName ) )
         {
-            m_xLateInitSettings->replaceByName( _rSettingsGroupName, makeAny( _rSettings ) );
+            m_xLateInitSettings->replaceByName( _rSettingsGroupName, Any( _rSettings ) );
             OSL_FAIL( "SwXMLImport::SetDocumentSpecificSettings: already have settings for this model!" );
         }
         else
-            m_xLateInitSettings->insertByName( _rSettingsGroupName, makeAny( _rSettings ) );
+            m_xLateInitSettings->insertByName( _rSettingsGroupName, Any( _rSettings ) );
     }
     catch( const Exception& )
     {
@@ -1779,8 +1779,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream)
     uno::Reference<document::XImporter> xImporter(xFilter, uno::UNO_QUERY_THROW);
     uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
     {
-        { "InputStream", uno::makeAny(xStream) },
-        { "InputMode", uno::makeAny(true) },
+        { "InputStream", uno::Any(xStream) },
+        { "InputMode", uno::Any(true) },
     }));
     xImporter->setTargetDocument(xModel);
 
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 140204d3dcb6..2fd9e9c40376 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -117,7 +117,7 @@ static void lcl_addAspect(
 {
     sal_Int64 nAspect = rObj.GetViewAspect();
     if ( nAspect )
-        rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), uno::makeAny( nAspect ) );
+        rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), uno::Any( nAspect ) );
 }
 
 static void lcl_addOutplaceProperties(
@@ -174,9 +174,9 @@ static void lcl_addFrameProperties(
     aAny >>= nHeight;
 
     if( !bIsAutoScroll )
-        rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_SCROLLBAR ), makeAny(bIsScrollingMode) );
+        rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_SCROLLBAR ), Any(bIsScrollingMode) );
     if( !bIsAutoBorder )
-        rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_BORDER ), makeAny(bIsBorderSet) );
+        rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_BORDER ), Any(bIsBorderSet) );
     if( SIZE_NOT_SET != nWidth )
         rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_MARGIN_HORI ), Any(nWidth) );
     if( SIZE_NOT_SET != nHeight )
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 1c48efe3eae6..43f1a98abe56 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -696,10 +696,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
             {
                 if( bValidURL )
                     xSet->setPropertyValue("PluginURL",
-                        makeAny( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
+                        Any( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
                 if( bValidMimeType )
                     xSet->setPropertyValue("PluginMimeType",
-                        makeAny( rMimeType ) );
+                        Any( rMimeType ) );
             }
 
             SwFrameFormat *const pFrameFormat =
@@ -824,31 +824,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
             if ( xSet.is() )
             {
                 xSet->setPropertyValue("FrameURL",
-                    makeAny( URIHelper::SmartRel2Abs(
+                    Any( URIHelper::SmartRel2Abs(
                             INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) );
 
                 xSet->setPropertyValue("FrameName",
-                    makeAny( rName ) );
+                    Any( rName ) );
 
                 if ( eScrollMode == ScrollingMode::Auto )
                     xSet->setPropertyValue("FrameIsAutoScroll",
-                        makeAny( true ) );
+                        Any( true ) );
                 else
                     xSet->setPropertyValue("FrameIsScrollingMode",
-                        makeAny( eScrollMode == ScrollingMode::Yes ) );
+                        Any( eScrollMode == ScrollingMode::Yes ) );
 
                 if ( bIsBorderSet )
                     xSet->setPropertyValue("FrameIsBorder",
-                        makeAny( bHasBorder ) );
+                        Any( bHasBorder ) );
                 else
                     xSet->setPropertyValue("FrameIsAutoBorder",
-                        makeAny( true ) );
+                        Any( true ) );
 
                 xSet->setPropertyValue("FrameMarginWidth",
-                    makeAny( sal_Int32( aMargin.Width() ) ) );
+                    Any( sal_Int32( aMargin.Width() ) ) );
 
                 xSet->setPropertyValue("FrameMarginHeight",
-                    makeAny( sal_Int32( aMargin.Height() ) ) );
+                    Any( sal_Int32( aMargin.Height() ) ) );
             }
 
             SwFrameFormat *const pFrameFormat =
@@ -914,14 +914,14 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
     OUString aParaName("AppletCommands");
     try
     {
-        xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
+        xSet->setPropertyValue( aParaName, Any( aCommandSequence ) );
     }
     catch ( uno::Exception& )
     {
         aParaName = "PluginCommands";
         try
         {
-            xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
+            xSet->setPropertyValue( aParaName, Any( aCommandSequence ) );
         }
         catch ( uno::Exception& )
         {