makeAny->Any in basctl..chart2

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

23 files changed, 129 insertions, 129 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 1fb25ad426ab..6c7215269bd3 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -330,7 +330,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
         }
 
         if (nOldNumberFormat != nNumberFormatKey)
-            xProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(nNumberFormatKey));
+            xProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(nNumberFormatKey));
     }
 
     return nNumberFormatKey;
@@ -386,7 +386,7 @@ Reference< XAxis > AxisHelper::createAxis(
 
             Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue("CrossoverPosition", uno::makeAny(eNewAxisPos) );
+                xProp->setPropertyValue("CrossoverPosition", uno::Any(eNewAxisPos) );
         }
 
         Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
@@ -478,9 +478,9 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( true ) );
+        xProps->setPropertyValue( "Show", uno::Any( true ) );
         LinePropertiesHelper::SetLineVisible( xProps );
-        xProps->setPropertyValue( "DisplayLabels", uno::makeAny( true ) );
+        xProps->setPropertyValue( "DisplayLabels", uno::Any( true ) );
     }
 }
 
@@ -488,7 +488,7 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( true ) );
+        xGridProperties->setPropertyValue( "Show", uno::Any( true ) );
         LinePropertiesHelper::SetLineVisible( xGridProperties );
     }
 }
@@ -504,7 +504,7 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( false ) );
+        xProps->setPropertyValue( "Show", uno::Any( false ) );
     }
 }
 
@@ -555,7 +555,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( false ) );
+        xGridProperties->setPropertyValue( "Show", uno::Any( false ) );
     }
 }
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index d33f5f9fccf4..a8314b62d801 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -237,7 +237,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod
 
             //set the property on all instances in all cases to get the different objects in sync!
 
-            uno::Any aNewValue = uno::makeAny(bIncludeHiddenCells);
+            uno::Any aNewValue(bIncludeHiddenCells);
 
             try
             {
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 830f229c02dd..c3b2da5d64aa 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -155,7 +155,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
                 aLabelAtSeries.ShowNumberInPercent = false;
                 aLabelAtSeries.ShowCategoryName = false;
             }
-            xSeriesProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabelAtSeries));
+            xSeriesProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabelAtSeries));
             uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
             if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
             {
@@ -172,7 +172,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
                             aLabel.ShowNumberInPercent = false;
                             aLabel.ShowCategoryName = false;
                         }
-                        xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+                        xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
                     }
                 }
             }
@@ -390,7 +390,7 @@ void setStackModeAtSeries(
     if( eStackMode == StackMode_AMBIGUOUS )
         return;
 
-    const uno::Any aPropValue = uno::makeAny(
+    const uno::Any aPropValue(
         ( (eStackMode == StackMode_Y_STACKED) ||
           (eStackMode == StackMode_Y_STACKED_PERCENT) )
         ? chart2::StackingDirection_Y_STACKING
@@ -554,7 +554,7 @@ void switchSymbolsOnOrOff( const Reference< beans::XPropertySet > & xSeriesPrope
             aSymbProp.Style = chart2::SymbolStyle_STANDARD;
             aSymbProp.StandardSymbol = nSeriesIndex;
         }
-        xSeriesProperties->setPropertyValue( "Symbol", uno::makeAny( aSymbProp ));
+        xSeriesProperties->setPropertyValue( "Symbol", uno::Any( aSymbProp ));
     }
     //todo: check attributed data points
 }
@@ -571,11 +571,11 @@ void switchLinesOnOrOff( const Reference< beans::XPropertySet > & xSeriesPropert
         if( (xSeriesProperties->getPropertyValue( "LineStyle") >>= eLineStyle ) &&
             eLineStyle == drawing::LineStyle_NONE )
         {
-            xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+            xSeriesProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
         }
     }
     else
-        xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+        xSeriesProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
 }
 
 void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesProperties, bool bThick )
@@ -589,7 +589,7 @@ void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesPrope
         nOldValue != nNewValue )
     {
         if( !(bThick && nOldValue>0))
-            xSeriesProperties->setPropertyValue( "LineWidth", uno::makeAny( nNewValue ) );
+            xSeriesProperties->setPropertyValue( "LineWidth", uno::Any( nNewValue ) );
     }
 }
 
@@ -863,7 +863,7 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp
             DataPointLabel aLabel;
             xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
             aLabel.ShowNumber = true;
-            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
         }
     }
     catch(const uno::Exception &e)
@@ -883,7 +883,7 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
             aLabel.ShowNumber = false;
             aLabel.ShowNumberInPercent = false;
             aLabel.ShowCategoryName = false;
-            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
         }
     }
     catch(const uno::Exception &e)
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index d75ad20ce3bf..7ddfd660ec9b 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -159,13 +159,13 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
 
     uno::Sequence< beans::PropertyValue > aArguments(3);
     aArguments[0] = beans::PropertyValue( "DataRowSource"
-        , -1, uno::makeAny( eRowSource )
+        , -1, uno::Any( eRowSource )
         , beans::PropertyState_DIRECT_VALUE );
     aArguments[1] = beans::PropertyValue( "FirstCellAsLabel"
-        , -1, uno::makeAny( bFirstCellAsLabel )
+        , -1, uno::Any( bFirstCellAsLabel )
         , beans::PropertyState_DIRECT_VALUE );
     aArguments[2] = beans::PropertyValue( "HasCategories"
-        , -1, uno::makeAny( bHasCategories )
+        , -1, uno::Any( bHasCategories )
         , beans::PropertyState_DIRECT_VALUE );
 
     return aArguments;
@@ -180,14 +180,14 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
     aArguments.realloc( aArguments.getLength() + 1 );
     aArguments[aArguments.getLength() - 1] =
         beans::PropertyValue( "CellRangeRepresentation"
-                              , -1, uno::makeAny( rRangeRepresentation )
+                              , -1, uno::Any( rRangeRepresentation )
                               , beans::PropertyState_DIRECT_VALUE );
     if( rSequenceMapping.getLength() )
     {
         aArguments.realloc( aArguments.getLength() + 1 );
         aArguments[aArguments.getLength() - 1] =
             beans::PropertyValue( "SequenceMapping"
-                                , -1, uno::makeAny( rSequenceMapping )
+                                , -1, uno::Any( rSequenceMapping )
                                 , beans::PropertyState_DIRECT_VALUE );
     }
     return aArguments;
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index ac19d718f1f9..54e1b52ecf93 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -177,7 +177,7 @@ void DiagramHelper::setVertical(
                     else if( bVertical && nDimIndex == 0 )
                         fNewAngleDegree = 90.0;
 
-                    xTitleProps->setPropertyValue("TextRotation", uno::makeAny(fNewAngleDegree));
+                    xTitleProps->setPropertyValue("TextRotation", uno::Any(fNewAngleDegree));
                 }
             }
         }
@@ -248,7 +248,7 @@ void DiagramHelper::setStackMode(
         else if( eStackMode == StackMode_Z_STACKED )
             eNewDirection = StackingDirection_Z_STACKING;
 
-        uno::Any aNewDirection( uno::makeAny(eNewDirection) );
+        uno::Any aNewDirection( eNewDirection );
 
         bool bPercent = false;
         if( eStackMode == StackMode_Y_STACKED_PERCENT )
@@ -593,7 +593,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
     {
         try
         {
-            xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) );
+            xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) );
             bChanged = true;
         }
         catch( const uno::Exception & ex )
@@ -915,7 +915,7 @@ Reference< data::XLabeledDataSequence >
                     {
                         try
                         {
-                            xProp->setPropertyValue( "Role", uno::makeAny( OUString("categories") ) );
+                            xProp->setPropertyValue( "Role", uno::Any( OUString("categories") ) );
                         }
                         catch( const uno::Exception & ex )
                         {
@@ -1021,7 +1021,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                     Any& rAny = rCat[0];
                     if( !(rAny>>=fTest) )
                     {
-                        rAny = uno::makeAny(fNan);
+                        rAny <<= fNan;
                     }
                 }
             }
@@ -1058,7 +1058,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                     Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE,  rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate );
                     if( aKeySeq.getLength() )
                     {
-                        xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(aKeySeq[0]));
+                        xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(aKeySeq[0]));
                     }
                 }
             }
@@ -1557,7 +1557,7 @@ void DiagramHelper::setGeometry3D(
              aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
     {
         DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(
-            *aIt, "Geometry3D", uno::makeAny( nNewGeometry ));
+            *aIt, "Geometry3D", uno::Any( nNewGeometry ));
     }
 }
 
@@ -1653,8 +1653,8 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >
     if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 )
         aNewPos.Secondary = 1.0 - aNewSize.Secondary;
 
-    xDiaProps->setPropertyValue( "RelativePosition", uno::makeAny(aNewPos) );
-    xDiaProps->setPropertyValue( "RelativeSize", uno::makeAny(aNewSize) );
+    xDiaProps->setPropertyValue( "RelativePosition", uno::Any(aNewPos) );
+    xDiaProps->setPropertyValue( "RelativeSize", uno::Any(aNewSize) );
 
     bChanged = (aOldPos.Anchor!=aNewPos.Anchor) ||
         (aOldPos.Primary!=aNewPos.Primary) ||
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index d717d09dca98..f7645da040cb 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -275,7 +275,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
     else if(rPropName == "LineWidth")
         aRet <<= mnLineWidth;
     else if(rPropName == "LineStyle")
-        aRet = uno::makeAny(meLineStyle);
+        aRet <<= meLineStyle;
     else if(rPropName == "LineColor")
         aRet <<= maLineColor;
     else if(rPropName == "LineTransparence")
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index b6cb49fefb34..da87d33a430f 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -55,7 +55,7 @@ struct lcl_NumberedStringGenerator
     vector< uno::Any > operator()()
     {
         vector< uno::Any > aRet(1);
-        aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter )) );
+        aRet[0] <<= m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter ));
         return aRet;
     }
 private:
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index f14810a9e64b..0101867ddbe3 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -251,7 +251,7 @@ public:
         vector< uno::Any > aRet( rVector );
         if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
             aRet.resize( m_nLevel+1 );
-        aRet[ m_nLevel ]=uno::makeAny(rNewValue);
+        aRet[ m_nLevel ] <<= rNewValue;
         return aRet;
     }
 
@@ -372,7 +372,7 @@ InternalDataProvider::InternalDataProvider(
                         for( sal_Int32 nN=0; nN<nLength; nN++)
                         {
                             vector< uno::Any > aVector(1);
-                            aVector[0] = uno::makeAny( aSimplecategories[nN] );
+                            aVector[0] <<= aSimplecategories[nN];
                             aNewCategories.push_back( aVector );
                         }
                     }
@@ -615,7 +615,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
 
         for (size_t i = 0; i < aRawElems.size(); ++i)
         {
-            std::vector<uno::Any> aLabels(1, uno::makeAny(aRawElems[i]));
+            std::vector<uno::Any> aLabels(1, uno::Any(aRawElems[i]));
             m_aInternalData.setComplexRowLabel(i, aLabels);
         }
 
@@ -629,7 +629,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
         sal_Int32 nColSize = m_aInternalData.getColumnCount();
         if (!aRawElems.empty() && nColSize)
         {
-            std::vector<uno::Any> aLabels(1, uno::makeAny(aRawElems[0]));
+            std::vector<uno::Any> aLabels(1, uno::Any(aRawElems[0]));
             m_aInternalData.setComplexColumnLabel(nColSize-1, aLabels);
 
             OUString aRangeRep = lcl_aLabelRangePrefix + OUString::number(nColSize-1);
@@ -769,19 +769,19 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
 {
     Sequence< beans::PropertyValue > aArguments( 4 );
     aArguments[0] = beans::PropertyValue(
-        "CellRangeRepresentation", -1, uno::makeAny( OUString(lcl_aCompleteRange) ),
+        "CellRangeRepresentation", -1, uno::Any( OUString(lcl_aCompleteRange) ),
         beans::PropertyState_DIRECT_VALUE );
     aArguments[1] = beans::PropertyValue(
-        "DataRowSource", -1, uno::makeAny(
+        "DataRowSource", -1, uno::Any(
             m_bDataInColumns
             ? css::chart::ChartDataRowSource_COLUMNS
             : css::chart::ChartDataRowSource_ROWS ),
         beans::PropertyState_DIRECT_VALUE );
     // internal data always contains labels and categories
     aArguments[2] = beans::PropertyValue(
-        "FirstCellAsLabel", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+        "FirstCellAsLabel", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE );
     aArguments[3] = beans::PropertyValue(
-        "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+        "HasCategories", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE );
 
     // #i85913# Sequence Mapping is not needed for internal data, as it is
     // applied to the data when the data source is created.
@@ -1374,7 +1374,7 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >&
 
     for(sal_Int32 nN=0; nN<nCount; ++nN )
     {
-        aSingleLabel[0]=uno::makeAny(rDates[nN]);
+        aSingleLabel[0] <<= rDates[nN];
         aNewCategories.push_back(aSingleLabel);
     }
 
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index ecfd84d8f395..2f1b58157db6 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -39,14 +39,14 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(true) );
+        xProp->setPropertyValue( "Show", uno::Any(true) );
 
         chart2::RelativePosition aRelativePosition;
         if( !(xProp->getPropertyValue( "RelativePosition") >>=  aRelativePosition) )
         {
             chart2::LegendPosition ePos = chart2::LegendPosition_LINE_END;
             if( !(xProp->getPropertyValue( "AnchorPosition") >>= ePos ) )
-                xProp->setPropertyValue( "AnchorPosition", uno::makeAny( ePos ));
+                xProp->setPropertyValue( "AnchorPosition", uno::Any( ePos ));
 
             css::chart::ChartLegendExpansion eExpansion =
                     ( ePos == chart2::LegendPosition_LINE_END ||
@@ -54,7 +54,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
                     ? css::chart::ChartLegendExpansion_HIGH
                     : css::chart::ChartLegendExpansion_WIDE;
             if( !(xProp->getPropertyValue( "Expansion") >>= eExpansion ) )
-                xProp->setPropertyValue( "Expansion", uno::makeAny( eExpansion ));
+                xProp->setPropertyValue( "Expansion", uno::Any( eExpansion ));
 
             xProp->setPropertyValue( "RelativePosition", uno::Any());
         }
@@ -69,7 +69,7 @@ void LegendHelper::hideLegend( ChartModel& rModel )
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(false) );
+        xProp->setPropertyValue( "Show", uno::Any(false) );
     }
 }
 
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index e5e29145a43a..6f53e7ead77d 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -135,12 +135,12 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference<
             drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
             xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
             if( aLineStyle == drawing::LineStyle_NONE )
-                xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+                xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
 
             sal_Int16 nLineTransparence=0;
             xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
             if(100==nLineTransparence)
-                xLineProperties->setPropertyValue( "LineTransparence", uno::makeAny( sal_Int16(0) ) );
+                xLineProperties->setPropertyValue( "LineTransparence", uno::Any( sal_Int16(0) ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -159,7 +159,7 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference<
             drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
             xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
             if( aLineStyle != drawing::LineStyle_NONE )
-                xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+                xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -175,7 +175,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference<
     {
         if( xLineProperties.is() )
         {
-            xLineProperties->setPropertyValue( "LineColor", uno::makeAny( nColor ) );
+            xLineProperties->setPropertyValue( "LineColor", uno::Any( nColor ) );
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 30a08c1ad283..dbf192bd6690 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -205,14 +205,14 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
             sal_Int32 n32Value = 0;
             if( rValue>>=n32Value )
             {
-                rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n32Value) );
+                rConvertedValue <<= static_cast<sal_Int16>(n32Value);
                 return true;
             }
 
             sal_Int64 n64Value = 0;
             if( rValue>>=n64Value )
             {
-                rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n64Value) );
+                rConvertedValue <<= static_cast<sal_Int16>(n64Value);
                 return true;
             }
         }
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9af4f05b171f..27b7394b7c6e 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1534,11 +1534,11 @@ Any ObjectIdentifier::getAny() const
     Any aAny;
     if ( isAutoGeneratedObject() )
     {
-        aAny = uno::makeAny( getObjectCID() );
+        aAny <<= getObjectCID();
     }
     else if ( isAdditionalShape() )
     {
-        aAny = uno::makeAny( getAdditionalShape() );
+        aAny <<= getAdditionalShape();
     }
     return aAny;
 }
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 134790941f4d..036699648163 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -144,7 +144,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
         if( useAutoScale())
         {
             if( ! bHasOldRefSize )
-                xProp->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ));
+                xProp->setPropertyValue( aRefSizeName, uno::Any( aRefSize ));
         }
         else
         {
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index abd80a3c8c7d..96b55ec76063 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -450,10 +450,10 @@ void RegressionCurveHelper::removeEquations(
                         uno::Reference< beans::XPropertySet > xEqProp( xRegCurve->getEquationProperties() ) ;
                         if( xEqProp.is())
                         {
-                            xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false ));
-                            xEqProp->setPropertyValue( "XName", uno::makeAny( OUString("x") ));
-                            xEqProp->setPropertyValue( "YName", uno::makeAny( OUString("f(x) ") ));
-                            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
+                            xEqProp->setPropertyValue( "ShowEquation", uno::Any( false ));
+                            xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") ));
+                            xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x) ") ));
+                            xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false ));
                         }
                     }
                 }
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index bbfa82b2e689..136c687e8174 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -185,7 +185,7 @@ RegressionCurveModel::RegressionCurveModel( tCurveType eCurveType ) :
     // set 0 line width (default) hard, so that it is always written to XML,
     // because the old implementation uses different defaults
     setFastPropertyValue_NoBroadcast(
-        LinePropertiesHelper::PROP_LINE_WIDTH, uno::makeAny( sal_Int32( 0 )));
+        LinePropertiesHelper::PROP_LINE_WIDTH, uno::Any( sal_Int32( 0 )));
     ModifyListenerHelper::addListener( m_xEquationProperties, m_xModifyEventForwarder );
 }
 
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 02af7a865cb8..8c191dd18719 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Exception;
 
 namespace chart
@@ -73,7 +73,7 @@ void RelativeSizeHelper::adaptFontSizes(
             {
                 xTargetProperties->setPropertyValue(
                     *aIt,
-                    makeAny( static_cast< float >(
+                    Any( static_cast< float >(
                                  calculate( fFontHeight, rOldReferenceSize, rNewReferenceSize ))));
             }
         }
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index 49ed57513e41..a654b8dc01ea 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -340,7 +340,7 @@ void SceneProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_7, false );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_8, false );
 
-    uno::Any aDefaultLightDirection( uno::makeAny( drawing::Direction3D( 0.0, 0.0, 1.0 ) ) );
+    uno::Any aDefaultLightDirection( drawing::Direction3D( 0.0, 0.0, 1.0 ) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_1, aDefaultLightDirection );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_2, ChartTypeHelper::getDefaultSimpleLightDirection(nullptr));
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_3, aDefaultLightDirection );
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 378d0f84b460..f7f1ff7ef1d8 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -119,7 +119,7 @@ void lcl_setRole(
 {
     Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY );
     if( xSeqProp.is())
-        xSeqProp->setPropertyValue( "Role", uno::makeAny( rRole ));
+        xSeqProp->setPropertyValue( "Role", uno::Any( rRole ));
 }
 
 void lcl_addSequenceToDataSource(
@@ -153,7 +153,7 @@ void lcl_setXMLRangePropertyAtDataSequence(
         Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW );
         Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo());
         if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ))
-            xProp->setPropertyValue( aXMLRangePropName, uno::makeAny( rXMLRange ));
+            xProp->setPropertyValue( aXMLRangePropName, uno::Any( rXMLRange ));
     }
     catch( const uno::Exception & ex )
     {
@@ -316,10 +316,10 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
     OSL_ASSERT( xErrorBar.is());
     if( xErrorBar.is())
     {
-        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny( nStyle ));
+        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle ));
     }
 
-    xSeriesProp->setPropertyValue( aPropName, uno::makeAny( xErrorBar ));
+    xSeriesProp->setPropertyValue( aPropName, uno::Any( xErrorBar ));
 
     return xErrorBar;
 }
@@ -357,7 +357,7 @@ void StatisticsHelper::removeErrorBars(
 {
     Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError ));
     if ( xErrorBar.is())
-        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny(
+        xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any(
                                          css::chart::ErrorBarStyle::NONE ));
 }
 
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 14b0461c18a2..e9e7c45e7702 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -81,7 +81,7 @@ void lcl_RotateLightSource( const Reference< beans::XPropertySet >& xSceneProper
                     aLightVector = rRotationMatrix*aLightVector;
 
                     xSceneProperties->setPropertyValue( rLightSourceDirection
-                        , uno::makeAny( BaseGFXHelper::B3DVectorToDirection3D( aLightVector ) ) );
+                        , uno::Any( BaseGFXHelper::B3DVectorToDirection3D( aLightVector ) ) );
                 }
             }
         }
@@ -205,13 +205,13 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     if( rScheme == ThreeDLookScheme_Unknown)
         return;
 
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::makeAny( true ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::Any( true ) );
 
     uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY );
     uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) );
-    uno::Any aADirection( uno::makeAny( rScheme == ThreeDLookScheme_Simple
+    uno::Any aADirection( rScheme == ThreeDLookScheme_Simple
         ? ChartTypeHelper::getDefaultSimpleLightDirection(xChartType)
-        : ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) ) );
+        : ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) );
 
     xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, aADirection );
     //rotate light direction when right angled axes are off but supported
@@ -230,10 +230,10 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     }
 
     sal_Int32 nColor = ::chart::ChartTypeHelper::getDefaultDirectLightColor( rScheme==ThreeDLookScheme_Simple, xChartType );
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, uno::makeAny( nColor ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, uno::Any( nColor ) );
 
     sal_Int32 nAmbientColor = ::chart::ChartTypeHelper::getDefaultAmbientLightColor( rScheme==ThreeDLookScheme_Simple, xChartType );
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, uno::makeAny( nAmbientColor ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, uno::Any( nAmbientColor ) );
 }
 
 bool lcl_isRealisticScheme( drawing::ShadeMode aShadeMode
@@ -957,7 +957,7 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >
             xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bOldRightAngledAxes;
             if( bOldRightAngledAxes!=bRightAngledAxes)
             {
-                xSceneProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( bRightAngledAxes ));
+                xSceneProperties->setPropertyValue( "RightAngledAxes", uno::Any( bRightAngledAxes ));
                 if(bRightAngledAxes)
                 {
                     ::basegfx::B3DHomMatrix aInverseRotation( lcl_getInverseRotationMatrix( xSceneProperties ) );
@@ -1012,7 +1012,7 @@ void ThreeDHelper::setRotationAngleToDiagram(
 
         //set new rotation to transformation matrix
         xSceneProperties->setPropertyValue(
-            "D3DTransformMatrix", uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
+            "D3DTransformMatrix", uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 
         //rotate lights if RightAngledAxes are not set or not supported
         bool bRightAngledAxes = false;
@@ -1129,7 +1129,7 @@ void ThreeDHelper::setCameraDistance(
         aVRP.setLength(fCameraDistance);
         aCG.vrp = BaseGFXHelper::B3DVectorToPosition3D( aVRP );
 
-        xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCG ));
+        xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::Any( aCG ));
     }
     catch( const uno::Exception & ex )
     {
@@ -1225,7 +1225,7 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD
             if( ! ( (xProp->getPropertyValue( "D3DSceneShadeMode" )>>=aOldShadeMode) &&
                     aOldShadeMode == aShadeMode ))
             {
-                xProp->setPropertyValue( "D3DSceneShadeMode", uno::makeAny( aShadeMode ));
+                xProp->setPropertyValue( "D3DSceneShadeMode", uno::Any( aShadeMode ));
             }
         }
 
@@ -1256,13 +1256,13 @@ void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet
         return;
 
     drawing::CameraGeometry aCameraGeo( ThreeDHelper::getDefaultCameraGeometry( bPieOrDonut ) );
-    xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCameraGeo ));
+    xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::Any( aCameraGeo ));
 
     ::basegfx::B3DHomMatrix aSceneRotation;
     if( bPieOrDonut )
         aSceneRotation.rotate( -F_PI/3.0, 0, 0 );
     xSceneProperties->setPropertyValue( "D3DTransformMatrix",
-        uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
+        uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 }
 
 void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >& xSceneProperties )
@@ -1280,13 +1280,13 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
     try
     {
         xSceneProperties->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode;
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::makeAny( false ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::Any( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::Any( false ) );
     }
     catch( const uno::Exception & ex )
     {
@@ -1332,7 +1332,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     rnRoundedEdges = static_cast< sal_Int32 >( nPercentDiagonal );
 
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                        , aPercentDiagonalPropertyName, uno::makeAny(nPercentDiagonal) ) )
+                        , aPercentDiagonalPropertyName, uno::Any(nPercentDiagonal) ) )
                         bDifferentRoundedEdges = true;
                 }
                 catch( const uno::Exception& e )
@@ -1345,7 +1345,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     xProp->getPropertyValue( aBorderStylePropertyName ) >>= aLineStyle;
 
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                        , aBorderStylePropertyName, uno::makeAny(aLineStyle) ) )
+                        , aBorderStylePropertyName, uno::Any(aLineStyle) ) )
                         bDifferentObjectLines = true;
                 }
                 catch( const uno::Exception& e )
@@ -1363,7 +1363,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     sal_Int32 nCurrentRoundedEdges = static_cast< sal_Int32 >( nPercentDiagonal );
                     if(nCurrentRoundedEdges!=rnRoundedEdges
                         || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                            , aPercentDiagonalPropertyName, uno::makeAny( static_cast< sal_Int16 >(rnRoundedEdges) ) ) )
+                            , aPercentDiagonalPropertyName, uno::Any( static_cast< sal_Int16 >(rnRoundedEdges) ) ) )
                     {
                         bDifferentRoundedEdges = true;
                     }
@@ -1375,7 +1375,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                     xProp->getPropertyValue( aBorderStylePropertyName ) >>= aCurrentLineStyle;
                     if(aCurrentLineStyle!=aLineStyle
                         || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries
-                            , aBorderStylePropertyName, uno::makeAny(aLineStyle) ) )
+                            , aBorderStylePropertyName, uno::Any(aLineStyle) ) )
                         bDifferentObjectLines = true;
                 }
             }
@@ -1407,8 +1407,8 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
     if(nObjectLines==1)
         aLineStyle = drawing::LineStyle_SOLID;
 
-    uno::Any aALineStyle( uno::makeAny(aLineStyle));
-    uno::Any aARoundedEdges( uno::makeAny( static_cast< sal_Int16 >( nRoundedEdges )));
+    uno::Any aALineStyle( aLineStyle);
+    uno::Any aARoundedEdges( static_cast< sal_Int16 >( nRoundedEdges ));
 
     ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 7a3290b86f6d..5701eb1bc510 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -181,7 +181,7 @@ uno::Reference< XTitle > TitleHelper::createOrShowTitle(
     if( xTitled.is())
     {
         css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW);
-        xProps->setPropertyValue("Visible",css::uno::makeAny(true));
+        xProps->setPropertyValue("Visible",css::uno::Any(true));
         return xTitled;
     }
     else
@@ -218,7 +218,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
         uno::Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
         if( xProps.is() )
         {
-            xProps->setPropertyValue( "Show", uno::makeAny( false ) );
+            xProps->setPropertyValue( "Show", uno::Any( false ) );
             xTitled = lcl_getTitleParent( eTitleType, xModel );
         }
     }
@@ -284,7 +284,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
                             || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) )
                         {
                             double fNewAngleDegree = 90.0;
-                            xTitleProps->setPropertyValue( "TextRotation", uno::makeAny( fNewAngleDegree ));
+                            xTitleProps->setPropertyValue( "TextRotation", uno::Any( fNewAngleDegree ));
                         }
                     }
                 }
@@ -369,7 +369,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText
         {
             try
             {
-                uno::Any aFontSize( uno::makeAny( *pDefaultCharHeight ));
+                uno::Any aFontSize( *pDefaultCharHeight );
                 xFormattedString->setPropertyValue( "CharHeight", aFontSize );
                 xFormattedString->setPropertyValue( "CharHeightAsian", aFontSize );
                 xFormattedString->setPropertyValue( "CharHeightComplex", aFontSize );
@@ -400,7 +400,7 @@ void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex
     if( xTitled.is())
     {
         css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW);
-        xProps->setPropertyValue("Visible",css::uno::makeAny(false));
+        xProps->setPropertyValue("Visible",css::uno::Any(false));
     }
 }
 
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index c4d7290d6fee..3ec0ff23343e 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -79,7 +79,7 @@ UncachedDataSequence::UncachedDataSequence(
           m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
 {
     registerProperties();
-    setFastPropertyValue_NoBroadcast( PROP_PROPOSED_ROLE, uno::makeAny( rRole ));
+    setFastPropertyValue_NoBroadcast( PROP_PROPOSED_ROLE, uno::Any( rRole ));
 }
 
 UncachedDataSequence::UncachedDataSequence( const UncachedDataSequence & rSource )
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 5a0cdef9a61c..84195460e1a0 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -74,12 +74,12 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
 
 void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
 {
-    rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::Any( OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::Any( sal_Int32(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::Any( sal_Int32(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedProperty* >& rList )
@@ -90,32 +90,32 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
-    rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( false ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::Any( awt::Gradient() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::Any( awt::Gradient() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::Any( drawing::Hatch() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
-//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::makeAny( drawing::RectanglePoint_LEFT_TOP ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::makeAny( false ) ) );//todo correct default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::makeAny( drawing::BitmapMode_REPEAT ) ) );
+//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::Any( OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::Any( uno::Reference< awt::XBitmap > (0) ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::Any( OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::Any( sal_Int16(0) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::Any( false ) ) );//todo correct default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::Any( sal_Int32(10) ) ) );//todo which default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::Any( sal_Int32(10) ) ) );//todo which default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::Any( drawing::BitmapMode_REPEAT ) ) );
 }
 
 } //namespace chart
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 78c86c73852a..a88cd561722e 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -130,7 +130,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
     {
         OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
-        aWrappedException.TargetException = uno::makeAny( ex );
+        aWrappedException.TargetException <<= ex;
         throw aWrappedException;
     }
 }
@@ -168,7 +168,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
     {
         OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
-        aWrappedException.TargetException = uno::makeAny( ex );
+        aWrappedException.TargetException <<= ex;
         throw aWrappedException;
     }