Just use Any ctor instead of makeAny in oox

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

4 files changed, 11 insertions, 11 deletions

diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index d33e0086cc08..774d784a6eb7 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -44,7 +44,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::uno::Any;
 using ::com::sun::star::drawing::XDrawPageSupplier;
 using ::com::sun::star::drawing::XShapes;
 using ::com::sun::star::chart2::XDiagram;
@@ -299,7 +299,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
     {
         Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
         PropertySet aProps( xChartDoc->getDiagram() );
-        aProps.setProperty( PROP_ExternalData , uno::makeAny(mrModel.maSheetPath) );
+        aProps.setProperty( PROP_ExternalData , uno::Any(mrModel.maSheetPath) );
     }
 }
 
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 07b8682974f8..44b3d3a3f0ea 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1123,9 +1123,9 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
 
     // Setting "LinkNumberFormatToSource" does not really work, at least not for axis :-/
     if (!bAxis)
-        rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.mbSourceLinked));
+        rPropSet.setProperty(PROP_LinkNumberFormatToSource, Any(rNumberFormat.mbSourceLinked));
     else
-        rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.maFormatCode.isEmpty()));
+        rPropSet.setProperty(PROP_LinkNumberFormatToSource, Any(rNumberFormat.maFormatCode.isEmpty()));
 }
 
 void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx )
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 72253723f91c..3ace8e9a703e 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -203,12 +203,12 @@ void importBorderProperties( PropertySet& rPropSet, Shape& rShape, const Graphic
     if (rLP.moLineWidth.has())
     {
         sal_Int32 nWidth = convertEmuToHmm(rLP.moLineWidth.get());
-        rPropSet.setProperty(PROP_LabelBorderWidth, uno::makeAny(nWidth));
-        rPropSet.setProperty(PROP_LabelBorderStyle, uno::makeAny(drawing::LineStyle_SOLID));
+        rPropSet.setProperty(PROP_LabelBorderWidth, uno::Any(nWidth));
+        rPropSet.setProperty(PROP_LabelBorderStyle, uno::Any(drawing::LineStyle_SOLID));
     }
     const Color& aColor = rLP.maLineFill.maFillColor;
     ::Color nColor = aColor.getColor(rGraphicHelper);
-    rPropSet.setProperty(PROP_LabelBorderColor, uno::makeAny(nColor));
+    rPropSet.setProperty(PROP_LabelBorderColor, uno::Any(nColor));
 }
 
 void importFillProperties( PropertySet& rPropSet, Shape& rShape, const GraphicHelper& rGraphicHelper, ModelObjectHelper& rModelObjHelper )
@@ -221,7 +221,7 @@ void importFillProperties( PropertySet& rPropSet, Shape& rShape, const GraphicHe
 
         const Color& aColor = rFP.maFillColor;
         ::Color nColor = aColor.getColor(rGraphicHelper);
-        rPropSet.setProperty(PROP_LabelFillColor, uno::makeAny(nColor));
+        rPropSet.setProperty(PROP_LabelFillColor, uno::Any(nColor));
     }
     else if(rFP.moFillType.has() && rFP.moFillType.get() == XML_pattFill)
     {
@@ -236,7 +236,7 @@ void importFillProperties( PropertySet& rPropSet, Shape& rShape, const GraphicHe
 
         const Color& aColor = rFP.maPatternProps.maPattBgColor;
         ::Color nColor = aColor.getColor(rGraphicHelper);
-        rPropSet.setProperty(PROP_LabelFillColor, uno::makeAny(nColor));
+        rPropSet.setProperty(PROP_LabelFillColor, uno::Any(nColor));
     }
 
 }
@@ -384,7 +384,7 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat
                 }
             }
 
-            aPropSet.setProperty( PROP_CustomLabelFields, makeAny( aSequence ) );
+            aPropSet.setProperty( PROP_CustomLabelFields, Any( aSequence ) );
             convertTextProperty(aPropSet, getFormatter(), mrModel.mxText->mxTextBody);
         }
     }
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 113c7fea7a9e..91684393c627 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -255,7 +255,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
         aPropSet.setProperty( PROP_Expansion, eLegendExpand );
 
         if (bTopRight && !bManualLayout)
-            aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos));
+            aPropSet.setProperty( PROP_RelativePosition , Any(eRelPos));
 
         aPropSet.setProperty(PROP_Overlay, mrModel.mbOverlay);