new loplugin unoany

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

27 files changed, 157 insertions, 154 deletions

diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index ec75f877fabf..6ff528df1e95 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -249,7 +249,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
         for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
             if ( aSet[nInd].Name.equals( aName ) )
             {
-                aSet[nInd].Value = uno::makeAny( aChars.toInt32() );
+                aSet[nInd].Value <<= aChars.toInt32();
                 bFound = true;
                 break;
             }
@@ -258,7 +258,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
         {
             aSet.realloc( nLen + 1 );
             aSet[nLen].Name = aName;
-            aSet[nLen].Value = uno::makeAny( aChars.toInt32() );
+            aSet[nLen].Value <<= aChars.toInt32();
         }
 
         m_xDocProp->setDocumentStatistics( aSet );
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 47aff71124a5..8470c4a0f182 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -300,7 +300,7 @@ void Color::addTransformation( sal_Int32 nElement, sal_Int32 nValue )
     sal_Int32 nSize = maInteropTransformations.getLength();
     maInteropTransformations.realloc(nSize + 1);
     maInteropTransformations[nSize].Name = getColorTransformationName( nToken );
-    maInteropTransformations[nSize].Value = css::uno::Any( nValue );
+    maInteropTransformations[nSize].Value <<= nValue;
 }
 
 void Color::addChartTintTransformation( double fTint )
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index b6d6e1986d49..37a6281f160d 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -216,7 +216,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                     aGuide.maName = rValue;
                     aGuide.maFormula = "logheight" ;
 
-                    aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                    aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                     aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
                 }
                 else
@@ -251,7 +251,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 aGuide.maName = rValue;
                 aGuide.maFormula = "logheight/" + OUString::number( nIntVal );
 
-                aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
             }
             break;
@@ -270,7 +270,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 aGuide.maName = rValue;
                 aGuide.maFormula = "max(logwidth,logheight)";
 
-                aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
             }
             break;
@@ -280,7 +280,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 aGuide.maName = rValue;
                 aGuide.maFormula = "min(logwidth,logheight)";
 
-                aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
             }
             break;
@@ -307,7 +307,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 aGuide.maName = rValue;
                 aGuide.maFormula = "min(logwidth,logheight)/" + OUString::number( nIntVal );
 
-                aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
             }
             break;
@@ -321,7 +321,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                     aGuide.maName = rValue;
                     aGuide.maFormula = "logwidth" ;
 
-                    aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                    aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                     aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
                 }
                 else
@@ -362,7 +362,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 aGuide.maName = rValue;
                 aGuide.maFormula = "logwidth/" + OUString::number( nIntVal );
 
-                aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+                aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
             }
             break;
@@ -374,7 +374,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
         if ( bConstant )
         {
             if (nConstant != -1) {
-                aRet.Value = Any( nConstant );
+                aRet.Value <<= nConstant;
                 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
             }
         }
@@ -388,7 +388,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
             }
             if ( ( n >= '0' ) && ( n <= '9' ) )
             {   // seems to be a ST_Coordinate
-                aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
+                aRet.Value <<= (sal_Int32)(rValue.toInt32() );
                 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
             }
             else
@@ -396,7 +396,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 sal_Int32 nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getAdjustmentGuideList(), rValue );
                 if ( nGuideIndex >= 0 )
                 {
-                    aRet.Value = Any( nGuideIndex );
+                    aRet.Value <<= nGuideIndex;
                     aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
                 }
                 else
@@ -404,13 +404,13 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                     nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), rValue );
                     if ( nGuideIndex >= 0 )
                     {
-                        aRet.Value = Any( nGuideIndex );
+                        aRet.Value <<= nGuideIndex;
                         aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
                     }
                     else
                     {
                         SAL_WARN("oox", "error: unhandled value " << rValue);
-                        aRet.Value = Any( rValue );
+                        aRet.Value <<= rValue;
                     }
                 }
             }
@@ -1061,7 +1061,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
             aGuide.maFormula = "("
                 + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) )
                 + ")/60000.0";
-            aAngles.First.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) );
+            aAngles.First.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide );
             aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION;
 
             // swing angle
@@ -1069,7 +1069,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
             aGuide.maFormula = "("
                 + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) )
                 + ")/60000.0";
-            aAngles.Second.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) );
+            aAngles.Second.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide );
             aAngles.Second.Type = EnhancedCustomShapeParameterType::EQUATION;
 
             mrPath2D.parameter.push_back( aScale );
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 175e291e93a8..8916ae27c1cc 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -40,7 +40,7 @@ void lcl_parseAdjustmentValue(std::vector<drawing::EnhancedCustomShapeAdjustment
         else if (aToken.startsWith(aValuePrefix))
         {
             OString aValue = aToken.copy(strlen(aValuePrefix), aToken.getLength() - strlen(aValuePrefix) - strlen(" }"));
-            aAdjustmentValue.Value = uno::makeAny(aValue.toInt32());
+            aAdjustmentValue.Value <<= aValue.toInt32();
         }
         else if (!aToken.startsWith("State = "))
             SAL_WARN("oox", "lcl_parseAdjustmentValue: unexpected prefix: " << aToken);
@@ -81,7 +81,7 @@ drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterP
     static const char aExpectedFVPrefix[] = "First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
     assert(aToken.startsWith(aExpectedFVPrefix));
     sal_Int32 nIndex = strlen(aExpectedFVPrefix);
-    aPair.First.Value = uno::makeAny(static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32()));
+    aPair.First.Value <<= static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32());
 
     static const char aExpectedFTPrefix[] = ", Type = (short) ";
     aToken = aToken.copy(nIndex);
@@ -93,7 +93,7 @@ drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterP
     aToken = aToken.copy(nIndex);
     assert(aToken.startsWith(aExpectedSVPrefix));
     nIndex = strlen(aExpectedSVPrefix);
-    aPair.Second.Value = uno::makeAny(static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32()));
+    aPair.Second.Value <<= static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32());
 
     static const char aExpectedSTPrefix[] = ", Type = (short) ";
     aToken = aToken.copy(nIndex);
@@ -250,7 +250,7 @@ void lcl_parseHandlePosition(std::vector<beans::PropertyValue>& rHandle, const O
 
                 beans::PropertyValue aPropertyValue;
                 aPropertyValue.Name = "Position";
-                aPropertyValue.Value = uno::makeAny(lcl_parseEnhancedCustomShapeParameterPair(aToken));
+                aPropertyValue.Value <<= lcl_parseEnhancedCustomShapeParameterPair(aToken);
                 rHandle.push_back(aPropertyValue);
             }
             else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -293,7 +293,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
                 static const char aExpectedVPrefix[] = "Value = (any) { (long) ";
                 assert(aToken.startsWith(aExpectedVPrefix));
                 sal_Int32 nIndex = strlen(aExpectedVPrefix);
-                aParameter.Value = uno::makeAny(aToken.getToken(0, '}', nIndex).toInt32());
+                aParameter.Value <<= aToken.getToken(0, '}', nIndex).toInt32();
 
                 static const char aExpectedTPrefix[] = ", Type = (short) ";
                 aToken = aToken.copy(nIndex);
@@ -303,7 +303,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
 
                 beans::PropertyValue aPropertyValue;
                 aPropertyValue.Name = rName;
-                aPropertyValue.Value = uno::makeAny(aParameter);
+                aPropertyValue.Value <<= aParameter;
                 rHandle.push_back(aPropertyValue);
 
             }
@@ -327,7 +327,7 @@ void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OStrin
         beans::PropertyValue aPropertyValue;
         aPropertyValue.Name = rName;
         // We only expect a Value here
-        aPropertyValue.Value = uno::makeAny(rValue.getToken(0, '}', nIndex).toInt32());
+        aPropertyValue.Value <<= rValue.getToken(0, '}', nIndex).toInt32();
         rHandle.push_back(aPropertyValue);
     }
     else
@@ -449,7 +449,7 @@ void lcl_parsePathCoordinateValues(std::vector<beans::PropertyValue>& rPath, con
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "Coordinates";
-    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aPairs));
+    aPropertyValue.Value <<= comphelper::containerToSequence(aPairs);
     rPath.push_back(aPropertyValue);
 }
 
@@ -513,7 +513,7 @@ void lcl_parsePathSegmentValues(std::vector<beans::PropertyValue>& rPath, const
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "Segments";
-    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSegments));
+    aPropertyValue.Value <<= comphelper::containerToSequence(aSegments);
     rPath.push_back(aPropertyValue);
 }
 
@@ -577,7 +577,7 @@ void lcl_parsePathTextFrameValues(std::vector<beans::PropertyValue>& rPath, cons
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "TextFrames";
-    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aTextFrames));
+    aPropertyValue.Value <<= comphelper::containerToSequence(aTextFrames);
     rPath.push_back(aPropertyValue);
 }
 
@@ -641,7 +641,7 @@ void lcl_parsePathSubViewSizeValues(std::vector<beans::PropertyValue>& rPath, co
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "SubViewSize";
-    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSizes));
+    aPropertyValue.Value <<= comphelper::containerToSequence(aSizes);
     rPath.push_back(aPropertyValue);
 }
 
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 7d39719a45ac..a72988627602 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -339,14 +339,14 @@ uno::Sequence<beans::PropertyValue> Diagram::getDomsAsPropertyValues() const
          ++i)
     {
         pValue[0].Name = i->first;
-        pValue[0].Value = uno::makeAny(i->second);
+        pValue[0].Value <<= i->second;
         ++pValue;
     }
 
     if ( 0 < maDataRelsMap.getLength() )
     {
         pValue[0].Name = "OOXDiagramDataRels";
-        pValue[0].Value = uno::makeAny ( maDataRelsMap );
+        pValue[0].Value <<= maDataRelsMap;
         ++pValue;
     }
 
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 65913bd426ba..3bf6d78e7624 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -163,7 +163,7 @@ public:
             sal_Int32 nIdx =  LayoutNodeContext::tagToVarIdx( getBaseToken( aElement ) );
             if( nIdx != -1 )
             {
-                mVariables[ nIdx ] = makeAny( rAttribs.getString( XML_val ).get() );
+                mVariables[ nIdx ] <<= rAttribs.getString( XML_val ).get();
             }
 
             return this;
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index d6c7de519991..8ef18a5d2965 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -88,7 +88,7 @@ css::beans::PropertyValue Effect::getEffect()
     }
 
     aRet.Name = msName;
-    aRet.Value = css::uno::Any( aSeq );
+    aRet.Value <<= aSeq;
 
     return aRet;
 }
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index fd4eadc3cfaf..dc7f85517ea2 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -39,37 +39,37 @@ EffectPropertiesContext::~EffectPropertiesContext()
 void EffectPropertiesContext::saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs )
 {
     if( rAttribs.hasAttribute( XML_algn ) )
-        rEffect.maAttribs["algn"] = makeAny( rAttribs.getString( XML_algn, "" ) );
+        rEffect.maAttribs["algn"] <<= rAttribs.getString( XML_algn, "" );
     if( rAttribs.hasAttribute( XML_blurRad ) )
-        rEffect.maAttribs["blurRad"] = makeAny( rAttribs.getInteger( XML_blurRad, 0 ) );
+        rEffect.maAttribs["blurRad"] <<= rAttribs.getInteger( XML_blurRad, 0 );
     if( rAttribs.hasAttribute( XML_dir ) )
-        rEffect.maAttribs["dir"] = makeAny( rAttribs.getInteger( XML_dir, 0 ) );
+        rEffect.maAttribs["dir"] <<= rAttribs.getInteger( XML_dir, 0 );
     if( rAttribs.hasAttribute( XML_dist ) )
-        rEffect.maAttribs["dist"] = makeAny( rAttribs.getInteger( XML_dist, 0 ) );
+        rEffect.maAttribs["dist"] <<= rAttribs.getInteger( XML_dist, 0 );
     if( rAttribs.hasAttribute( XML_kx ) )
-        rEffect.maAttribs["kx"] =  makeAny( rAttribs.getInteger( XML_kx, 0 ) );
+        rEffect.maAttribs["kx"] <<= rAttribs.getInteger( XML_kx, 0 );
     if( rAttribs.hasAttribute( XML_ky ) )
-        rEffect.maAttribs["ky"] = makeAny( rAttribs.getInteger( XML_ky, 0 ) );
+        rEffect.maAttribs["ky"] <<= rAttribs.getInteger( XML_ky, 0 );
     if( rAttribs.hasAttribute( XML_rotWithShape ) )
-        rEffect.maAttribs["rotWithShape"] = makeAny( rAttribs.getInteger( XML_rotWithShape, 0 ) );
+        rEffect.maAttribs["rotWithShape"] <<= rAttribs.getInteger( XML_rotWithShape, 0 );
     if( rAttribs.hasAttribute( XML_sx ) )
-        rEffect.maAttribs["sx"] = makeAny( rAttribs.getInteger( XML_sx, 0 ) );
+        rEffect.maAttribs["sx"] <<= rAttribs.getInteger( XML_sx, 0 );
     if( rAttribs.hasAttribute( XML_sy ) )
-        rEffect.maAttribs["sy"] = makeAny( rAttribs.getInteger( XML_sy, 0 ) );
+        rEffect.maAttribs["sy"] <<= rAttribs.getInteger( XML_sy, 0 );
     if( rAttribs.hasAttribute( XML_rad ) )
-        rEffect.maAttribs["rad"] = makeAny( rAttribs.getInteger( XML_rad, 0 ) );
+        rEffect.maAttribs["rad"] <<= rAttribs.getInteger( XML_rad, 0 );
     if( rAttribs.hasAttribute( XML_endA ) )
-        rEffect.maAttribs["endA"] = makeAny( rAttribs.getInteger( XML_endA, 0 ) );
+        rEffect.maAttribs["endA"] <<= rAttribs.getInteger( XML_endA, 0 );
     if( rAttribs.hasAttribute( XML_endPos ) )
-        rEffect.maAttribs["endPos"] = makeAny( rAttribs.getInteger( XML_endPos, 0 ) );
+        rEffect.maAttribs["endPos"] <<= rAttribs.getInteger( XML_endPos, 0 );
     if( rAttribs.hasAttribute( XML_fadeDir ) )
-        rEffect.maAttribs["fadeDir"] = makeAny( rAttribs.getInteger( XML_fadeDir, 0 ) );
+        rEffect.maAttribs["fadeDir"] <<= rAttribs.getInteger( XML_fadeDir, 0 );
     if( rAttribs.hasAttribute( XML_stA ) )
-        rEffect.maAttribs["stA"] = makeAny( rAttribs.getInteger( XML_stA, 0 ) );
+        rEffect.maAttribs["stA"] <<= rAttribs.getInteger( XML_stA, 0 );
     if( rAttribs.hasAttribute( XML_stPos ) )
-        rEffect.maAttribs["stPos"] = makeAny( rAttribs.getInteger( XML_stPos, 0 ) );
+        rEffect.maAttribs["stPos"] <<= rAttribs.getInteger( XML_stPos, 0 );
     if( rAttribs.hasAttribute( XML_grow ) )
-        rEffect.maAttribs["grow"] = makeAny( rAttribs.getInteger( XML_grow, 0 ) );
+        rEffect.maAttribs["grow"] <<= rAttribs.getInteger( XML_grow, 0 );
 }
 
 ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 6bdce225da98..47c15028d5dd 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -793,16 +793,16 @@ css::beans::PropertyValue ArtisticEffectProperties::getEffect()
     {
         css::uno::Sequence< css::beans::PropertyValue > aGraphicSeq( 2 );
         aGraphicSeq[0].Name = "Id";
-        aGraphicSeq[0].Value = uno::makeAny( mrOleObjectInfo.maProgId );
+        aGraphicSeq[0].Value <<= mrOleObjectInfo.maProgId;
         aGraphicSeq[1].Name = "Data";
-        aGraphicSeq[1].Value = uno::makeAny( mrOleObjectInfo.maEmbeddedData );
+        aGraphicSeq[1].Value <<= mrOleObjectInfo.maEmbeddedData;
 
         aSeq[i].Name = "OriginalGraphic";
-        aSeq[i].Value = uno::makeAny( aGraphicSeq );
+        aSeq[i].Value <<= aGraphicSeq;
     }
 
     aRet.Name = msName;
-    aRet.Value = css::uno::Any( aSeq );
+    aRet.Value <<= aSeq;
 
     return aRet;
 }
diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx
index 06c20131b6ef..012c3f34370f 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -371,7 +371,7 @@ ContextHandlerRef ArtisticEffectContext::onCreateContext(
         {
             OUString sName = ArtisticEffectProperties::getEffectString( nAttrib );
             if( !sName.isEmpty() )
-                maEffect.maAttribs[sName] = uno::makeAny( rAttribs.getInteger( nAttrib, 0 ) );
+                maEffect.maAttribs[sName] <<= rAttribs.getInteger( nAttrib, 0 );
         }
     }
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 01d79c08ec96..9533f4ec9654 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -98,7 +98,7 @@ namespace oox { namespace drawingml {
 
 #define PUT_PROP( aProperties, nPos, sPropName, aPropValue ) \
     aProperties[nPos].Name = sPropName; \
-    aProperties[nPos].Value = Any( aPropValue );
+    aProperties[nPos].Value <<= aPropValue;
 
 Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
 : mpLinePropertiesPtr( new LineProperties )
@@ -764,7 +764,7 @@ Reference< XShape > const & Shape::createAndInsert(
                         mpCustomShapePropertiesPtr->getShapePresetTypeName();
                     OUString sShapePresetTypeName(reinterpret_cast< const char* >(
                         aNameSeq.getConstArray()), aNameSeq.getLength(), RTL_TEXTENCODING_UTF8);
-                    aGrabBag[length].Value = uno::makeAny(sShapePresetTypeName);
+                    aGrabBag[length].Value <<= sShapePresetTypeName;
                     propertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag));
                 }
                 //If the text box has links then save the link information so that
@@ -777,11 +777,11 @@ Reference< XShape > const & Shape::createAndInsert(
                     sal_Int32 length = aGrabBag.getLength();
                     aGrabBag.realloc( length + 3 );
                     aGrabBag[length].Name = "TxbxHasLink";
-                    aGrabBag[length].Value = uno::makeAny(this->isLinkedTxbx());
+                    aGrabBag[length].Value <<= this->isLinkedTxbx();
                     aGrabBag[length + 1 ].Name = "Txbx-Id";
-                    aGrabBag[length + 1 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().id);
+                    aGrabBag[length + 1 ].Value <<= this->getLinkedTxbxAttributes().id;
                     aGrabBag[length + 2 ].Name = "Txbx-Seq";
-                    aGrabBag[length + 2 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().seq);
+                    aGrabBag[length + 2 ].Value <<= this->getLinkedTxbxAttributes().seq;
                     propertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag));
                 }
 
@@ -835,7 +835,7 @@ Reference< XShape > const & Shape::createAndInsert(
                     xPropertySet->getPropertyValue(aGrabBagPropName) >>= aGrabBag;
                     beans::PropertyValue aPair;
                     aPair.Name = "mso-rotation-angle";
-                    aPair.Value = uno::makeAny(mnRotation);
+                    aPair.Value <<= mnRotation;
                     if (aGrabBag.hasElements())
                     {
                         sal_Int32 nLength = aGrabBag.getLength();
@@ -912,11 +912,11 @@ Reference< XShape > const & Shape::createAndInsert(
                 sal_Int32 length = aGrabBag.getLength();
                 aGrabBag.realloc( length + 3 );
                 aGrabBag[length].Name = "TxbxHasLink";
-                aGrabBag[length].Value = uno::makeAny(this->isLinkedTxbx());
+                aGrabBag[length].Value <<= isLinkedTxbx();
                 aGrabBag[length + 1 ].Name = "Txbx-Id";
-                aGrabBag[length + 1 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().id);
+                aGrabBag[length + 1 ].Value <<= getLinkedTxbxAttributes().id;
                 aGrabBag[length + 2 ].Name = "Txbx-Seq";
-                aGrabBag[length + 2 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().seq);
+                aGrabBag[length + 2 ].Value <<= getLinkedTxbxAttributes().seq;
                 propertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aGrabBag));
             }
 
@@ -935,8 +935,10 @@ Reference< XShape > const & Shape::createAndInsert(
             // Store original fill and line colors of the shape and the theme color name to InteropGrabBag
             Sequence< PropertyValue > aProperties( 6 );  //allocate the maximum possible number of slots
             sal_Int32 nSize = 2;
-            PUT_PROP( aProperties, 0, "OriginalSolidFillClr", aShapeProps.getProperty(PROP_FillColor) );
-            PUT_PROP( aProperties, 1, "OriginalLnSolidFillClr", aShapeProps.getProperty(PROP_LineColor) );
+            aProperties[0].Name = "OriginalSolidFillClr";
+            aProperties[0].Value = aShapeProps.getProperty(PROP_FillColor);
+            aProperties[1].Name = "OriginalLnSolidFillClr";
+            aProperties[1].Value = aShapeProps.getProperty(PROP_LineColor);
             OUString sColorFillScheme = aFillProperties.maFillColor.getSchemeName();
             if( !aFillProperties.maFillColor.isPlaceHolder() && !sColorFillScheme.isEmpty() )
             {
@@ -1013,7 +1015,8 @@ Reference< XShape > const & Shape::createAndInsert(
                     if( !aEffect.Name.isEmpty() )
                     {
                         Sequence< PropertyValue > aEffectsGrabBag( 3 );
-                        PUT_PROP( aEffectsGrabBag, 0, "Attribs", aEffect.Value );
+                        aEffectsGrabBag[0].Name = "Attribs";
+                        aEffectsGrabBag[0].Value = aEffect.Value;
 
                         Color& aColor( it->moColor );
                         OUString sColorScheme = aColor.getSchemeName();
@@ -1046,9 +1049,9 @@ Reference< XShape > const & Shape::createAndInsert(
             if( aCamera3DEffects.getLength() > 0 || aLightRig3DEffects.getLength() > 0 || aShape3DEffects.getLength() > 0 )
             {
                 Sequence< PropertyValue > a3DEffectsGrabBag( 3 );
-                PUT_PROP( a3DEffectsGrabBag, 0, "Camera", Any( aCamera3DEffects ) );
-                PUT_PROP( a3DEffectsGrabBag, 1, "LightRig", Any( aLightRig3DEffects ) );
-                PUT_PROP( a3DEffectsGrabBag, 2, "Shape3D", Any( aShape3DEffects ) );
+                PUT_PROP( a3DEffectsGrabBag, 0, "Camera", aCamera3DEffects );
+                PUT_PROP( a3DEffectsGrabBag, 1, "LightRig", aLightRig3DEffects );
+                PUT_PROP( a3DEffectsGrabBag, 2, "Shape3D", aShape3DEffects );
                 putPropertyToGrabBag( "3DEffectProperties", Any( a3DEffectsGrabBag ) );
             }
 
@@ -1539,17 +1542,17 @@ uno::Sequence< uno::Sequence< uno::Any > >  Shape::resolveRelationshipsOfTypeFro
                 // [0] => RID, [1] => InputStream [2] => extension
                 OUString sRelId = aIt->second.maId;
 
-                diagramRelTuple[0] = uno::makeAny ( sRelId );
+                diagramRelTuple[0] <<= sRelId;
                 OUString sTarget = xImageRels->getFragmentPathFromRelId( sRelId );
 
                 uno::Reference< io::XInputStream > xImageInputStrm( rFilter.openInputStream( sTarget ), uno::UNO_SET_THROW );
                 StreamDataSequence dataSeq;
                 if ( rFilter.importBinaryData( dataSeq, sTarget ) )
                 {
-                    diagramRelTuple[1] = uno::makeAny( dataSeq );
+                    diagramRelTuple[1] <<= dataSeq;
                 }
 
-                diagramRelTuple[2] = uno::makeAny( sTarget.copy( sTarget.lastIndexOf(".") ) );
+                diagramRelTuple[2] <<= sTarget.copy( sTarget.lastIndexOf(".") );
 
                 xRelListTemp[counter] = diagramRelTuple;
                 ++counter;
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index cf1930afdafe..5a4b3213d2f7 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -218,37 +218,37 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getCameraAttr
     if( mfFieldOfVision.has() )
     {
         aSeq[nSize].Name = "fov";
-        aSeq[nSize].Value = css::uno::Any( mfFieldOfVision.use() );
+        aSeq[nSize].Value <<= mfFieldOfVision.use();
         nSize++;
     }
     if( mfZoom.has() )
     {
         aSeq[nSize].Name = "zoom";
-        aSeq[nSize].Value = css::uno::Any( mfZoom.use() );
+        aSeq[nSize].Value <<= mfZoom.use();
         nSize++;
     }
     if( mnPreset.has() )
     {
         aSeq[nSize].Name = "prst";
-        aSeq[nSize].Value = css::uno::Any( getCameraPrstName( mnPreset.use() ) );
+        aSeq[nSize].Value <<= getCameraPrstName( mnPreset.use() );
         nSize++;
     }
     if( maCameraRotation.mnLatitude.has() )
     {
         aSeq[nSize].Name = "rotLat";
-        aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnLatitude.use() );
+        aSeq[nSize].Value <<= maCameraRotation.mnLatitude.use();
         nSize++;
     }
     if( maCameraRotation.mnLongitude.has() )
     {
         aSeq[nSize].Name = "rotLon";
-        aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnLongitude.use() );
+        aSeq[nSize].Value <<= maCameraRotation.mnLongitude.use();
         nSize++;
     }
     if( maCameraRotation.mnRevolution.has() )
     {
         aSeq[nSize].Name = "rotRev";
-        aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnRevolution.use() );
+        aSeq[nSize].Value <<= maCameraRotation.mnRevolution.use();
         nSize++;
     }
     aSeq.realloc( nSize );
@@ -262,31 +262,31 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getLightRigAt
     if( mnLightRigDirection.has() )
     {
         aSeq[nSize].Name = "dir";
-        aSeq[nSize].Value = css::uno::Any( getLightRigDirName( mnLightRigDirection.use() ) );
+        aSeq[nSize].Value <<= getLightRigDirName( mnLightRigDirection.use() );
         nSize++;
     }
     if( mnLightRigType.has() )
     {
         aSeq[nSize].Name = "rig";
-        aSeq[nSize].Value = css::uno::Any( getLightRigName( mnLightRigType.use() ) );
+        aSeq[nSize].Value <<= getLightRigName( mnLightRigType.use() );
         nSize++;
     }
     if( maLightRigRotation.mnLatitude.has() )
     {
         aSeq[nSize].Name = "rotLat";
-        aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnLatitude.use() );
+        aSeq[nSize].Value <<= maLightRigRotation.mnLatitude.use();
         nSize++;
     }
     if( maLightRigRotation.mnLongitude.has() )
     {
         aSeq[nSize].Name = "rotLon";
-        aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnLongitude.use() );
+        aSeq[nSize].Value <<= maLightRigRotation.mnLongitude.use();
         nSize++;
     }
     if( maLightRigRotation.mnRevolution.has() )
     {
         aSeq[nSize].Name = "rotRev";
-        aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnRevolution.use() );
+        aSeq[nSize].Value <<= maLightRigRotation.mnRevolution.use();
         nSize++;
     }
     aSeq.realloc( nSize );
@@ -300,19 +300,19 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getBevelAttri
     if( rProps.mnPreset.has() )
     {
         aSeq[nSize].Name = "prst";
-        aSeq[nSize].Value = css::uno::Any( getBevelPresetTypeString( rProps.mnPreset.use() ) );
+        aSeq[nSize].Value <<= getBevelPresetTypeString( rProps.mnPreset.use() );
         nSize++;
     }
     if( rProps.mnWidth.has() )
     {
         aSeq[nSize].Name = "w";
-        aSeq[nSize].Value = css::uno::Any( rProps.mnWidth.use() );
+        aSeq[nSize].Value <<= rProps.mnWidth.use();
         nSize++;
     }
     if( rProps.mnHeight.has() )
     {
         aSeq[nSize].Name = "h";
-        aSeq[nSize].Value = css::uno::Any( rProps.mnHeight.use() );
+        aSeq[nSize].Value <<= rProps.mnHeight.use();
         nSize++;
     }
     aSeq.realloc( nSize );
@@ -328,17 +328,17 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getColorAttri
     {
         // RGB color and transparency value
         aSeq[0].Name = "rgbClr";
-        aSeq[0].Value = css::uno::Any( rColor.getColor( rGraphicHelper, rPhClr ) );
+        aSeq[0].Value <<= rColor.getColor( rGraphicHelper, rPhClr );
         aSeq[1].Name = "rgbClrTransparency";
-        aSeq[1].Value = css::uno::Any( rColor.getTransparency() );
+        aSeq[1].Value <<= rColor.getTransparency();
     }
     else
     {
         // scheme color with name and transformations
         aSeq[0].Name = "schemeClr";
-        aSeq[0].Value = css::uno::Any( sColorScheme );
+        aSeq[0].Value <<= sColorScheme;
         aSeq[1].Name = "schemeClrTransformations";
-        aSeq[1].Value = css::uno::Any( rColor.getTransformations() );
+        aSeq[1].Value <<= rColor.getTransformations();
     }
     return aSeq;
 }
@@ -351,49 +351,49 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getShape3DAtt
     if( mnExtrusionH.has() )
     {
         aSeq[nSize].Name = "extrusionH";
-        aSeq[nSize].Value = css::uno::Any( mnExtrusionH.use() );
+        aSeq[nSize].Value <<= mnExtrusionH.use();
         nSize++;
     }
     if( mnContourW.has() )
     {
         aSeq[nSize].Name = "contourW";
-        aSeq[nSize].Value = css::uno::Any( mnContourW.use() );
+        aSeq[nSize].Value <<= mnContourW.use();
         nSize++;
     }
     if( mnShapeZ.has() )
     {
         aSeq[nSize].Name = "z";
-        aSeq[nSize].Value = css::uno::Any( mnShapeZ.use() );
+        aSeq[nSize].Value <<= mnShapeZ.use();
         nSize++;
     }
     if( mnMaterial.has() )
     {
         aSeq[nSize].Name = "prstMaterial";
-        aSeq[nSize].Value = css::uno::Any( getPresetMaterialTypeString( mnMaterial.use() ) );
+        aSeq[nSize].Value <<= getPresetMaterialTypeString( mnMaterial.use() );
         nSize++;
     }
     if( maTopBevelProperties.has() )
     {
         aSeq[nSize].Name = "bevelT";
-        aSeq[nSize].Value = css::uno::Any( getBevelAttributes( maTopBevelProperties.use() ) );
+        aSeq[nSize].Value <<= getBevelAttributes( maTopBevelProperties.use() );
         nSize++;
     }
     if( maBottomBevelProperties.has() )
     {
         aSeq[nSize].Name = "bevelB";
-        aSeq[nSize].Value = css::uno::Any( getBevelAttributes( maBottomBevelProperties.use() ) );
+        aSeq[nSize].Value <<= getBevelAttributes( maBottomBevelProperties.use() );
         nSize++;
     }
     if( maExtrusionColor.isUsed() )
     {
         aSeq[nSize].Name = "extrusionClr";
-        aSeq[nSize].Value = css::uno::Any( getColorAttributes( maExtrusionColor, rGraphicHelper, rPhClr ) );
+        aSeq[nSize].Value <<= getColorAttributes( maExtrusionColor, rGraphicHelper, rPhClr );
         nSize++;
     }
     if( maContourColor.isUsed() )
     {
         aSeq[nSize].Name = "contourClr";
-        aSeq[nSize].Value = css::uno::Any( getColorAttributes( maContourColor, rGraphicHelper, rPhClr ) );
+        aSeq[nSize].Value <<= getColorAttributes( maContourColor, rGraphicHelper, rPhClr );
         nSize++;
     }
     aSeq.realloc( nSize );
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index 52abd9500456..b3b6b50e66e9 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -304,7 +304,7 @@ void TextEffectsContext::onEndElement()
         Sequence<PropertyValue> aSeq;
         PropertyValue aPropertyValue = mpGrabBagStack->getRootProperty();
         aPropertyValue.Value >>= aSeq;
-        aPropertyValue.Value = makeAny(aSeq[0]);
+        aPropertyValue.Value <<= aSeq[0];
 
         mrTextEffectsProperties.push_back(aPropertyValue);
     }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b019f5699317..0c887c7b79d0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3029,12 +3029,12 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet )
             rXPropSet->getPropertyValue( "ShadowYDistance" ) >>= dY;
 
             aShadowAttribsGrabBag[0].Name = "dist";
-            aShadowAttribsGrabBag[0].Value = Any(static_cast< sal_Int32 >(sqrt(dX*dX + dY*dY) * 360));
+            aShadowAttribsGrabBag[0].Value <<= static_cast< sal_Int32 >(sqrt(dX*dX + dY*dY) * 360);
             aShadowAttribsGrabBag[1].Name = "dir";
-            aShadowAttribsGrabBag[1].Value = Any((static_cast< sal_Int32 >(atan2(dY,dX) * 180 * 60000 / M_PI) + 21600000) % 21600000);
+            aShadowAttribsGrabBag[1].Value <<= (static_cast< sal_Int32 >(atan2(dY,dX) * 180 * 60000 / M_PI) + 21600000) % 21600000;
 
             aShadowGrabBag[0].Name = "Attribs";
-            aShadowGrabBag[0].Value = Any(aShadowAttribsGrabBag);
+            aShadowGrabBag[0].Value <<= aShadowAttribsGrabBag;
             aShadowGrabBag[1].Name = "RgbClr";
             aShadowGrabBag[1].Value = rXPropSet->getPropertyValue( "ShadowColor" );
             aShadowGrabBag[2].Name = "RgbClrTransparency";
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx
index fdae712d00e8..c78ec045e555 100644
--- a/oox/source/helper/grabbagstack.cxx
+++ b/oox/source/helper/grabbagstack.cxx
@@ -38,7 +38,7 @@ PropertyValue GrabBagStack::getRootProperty()
 
     PropertyValue aProperty;
     aProperty.Name = mCurrentElement.maElementName;
-    aProperty.Value = makeAny(comphelper::containerToSequence(mCurrentElement.maPropertyList));
+    aProperty.Value <<= comphelper::containerToSequence(mCurrentElement.maPropertyList);
 
     return aProperty;
 }
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index 08b390a10aa7..3c7bce7849d0 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -113,10 +113,10 @@ void SaveInteropProperties(uno::Reference<frame::XModel> const& xModel,
             objectsList.erase(it);
     }
 
-    objectsList[rObjectName] = uno::Any( aGrabBagAttribute );
+    objectsList[rObjectName] <<= aGrabBagAttribute;
 
     // put objects list back into the grab bag
-    aGrabBag[sEmbeddingsPropName] = uno::Any(objectsList.getAsConstPropertyValueList());
+    aGrabBag[sEmbeddingsPropName] <<= objectsList.getAsConstPropertyValueList();
 
     // put grab bag back into the document
     xDocProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList()));
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 0173d3794105..94cdd9672e39 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -106,7 +106,7 @@ namespace oox { namespace ppt {
                     SAL_INFO("oox.ppt", "OOX: TODO what to do with more than one" );
                     break;
                 }
-                rTarget = makeAny( aParaTarget );
+                rTarget <<= aParaTarget;
             }
             break;
         }
@@ -130,7 +130,7 @@ namespace oox { namespace ppt {
             SAL_INFO("oox.ppt", "OOX: TODO sldTgt" );
             break;
         case XML_sndTgt:
-            aTarget = makeAny(msValue);
+            aTarget <<= msValue;
             break;
         case XML_spTgt:
         {
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index 1c879a6582ec..7cd57abd9819 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -155,7 +155,7 @@ namespace oox { namespace ppt {
     {
         if( isCurrentElement( mnElement ) && maColor.isUsed() )
         {
-            maValue = makeAny( maColor.getColor( getFilter().getGraphicHelper() ) );
+            maValue <<= maColor.getColor( getFilter().getGraphicHelper() );
         }
     }
 
@@ -166,7 +166,7 @@ namespace oox { namespace ppt {
         case PPT_TOKEN( boolVal ):
         {
             bool val = rAttribs.getBool( XML_val, false );
-            maValue = makeAny( val );
+            maValue <<= val;
             return this;
         }
         case PPT_TOKEN( clrVal ):
@@ -175,20 +175,20 @@ namespace oox { namespace ppt {
         case PPT_TOKEN( fltVal ):
         {
             double val = rAttribs.getDouble( XML_val, 0.0 );
-            maValue = makeAny( val );
+            maValue <<= val;
             return this;
         }
         case PPT_TOKEN( intVal ):
         {
             sal_Int32 val = rAttribs.getInteger( XML_val, 0 );
-            maValue = makeAny( val );
+            maValue <<= val;
             return this;
         }
         case PPT_TOKEN( strVal ):
         {
             OUString val = rAttribs.getString( XML_val, OUString() );
             convertMeasure( val ); // ignore success or failure if it fails, use as is
-            maValue = makeAny( val );
+            maValue <<= val;
             return this;
         }
         default:
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index d6e6781961cc..99d78da02ea8 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -76,7 +76,7 @@ namespace oox { namespace ppt {
                     sAttributes.append( iter->name );
                 }
                 OUString sTmp( sAttributes.makeStringAndClear() );
-                mpNode->getNodeProperties()[ NP_ATTRIBUTENAME ] = makeAny( sTmp );
+                mpNode->getNodeProperties()[ NP_ATTRIBUTENAME ] <<= sTmp;
             }
             break;
         }
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index c8e11e0f6979..c6920899b45e 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -377,9 +377,9 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
         if( attribs.hasAttribute( XML_afterEffect ) )
         {
             aUserData[ "after-effect" ]
-                = makeAny( attribs.getBool( XML_afterEffect, false ) );
+                <<= attribs.getBool( XML_afterEffect, false );
         }
-        aProps[ NP_AUTOREVERSE ] = makeAny( attribs.getBool( XML_autoRev, false ) );
+        aProps[ NP_AUTOREVERSE ] <<= attribs.getBool( XML_autoRev, false );
 
         // TODO
         if( attribs.hasAttribute( XML_bldLvl ) )
@@ -528,7 +528,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
                 nEffectPresetClass = 0;
                 break;
             }
-            aUserData[ "preset-class" ] = makeAny( nEffectPresetClass );
+            aUserData[ "preset-class" ] <<= nEffectPresetClass;
             if( attribs.hasAttribute( XML_presetID ) )
             {
                 sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
@@ -537,11 +537,11 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
                     p++;
 
                 aUserData[ "preset-id" ]
-                    = makeAny( OUString::createFromAscii( p->mpStrPresetId ) );
+                    <<= OUString::createFromAscii( p->mpStrPresetId );
                 sal_Int32 nPresetSubType = attribs.getInteger( XML_presetSubtype, 0 );
                 if( nPresetSubType )
                 {
-                    aUserData[ "preset-sub-type" ] = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) );
+                    aUserData[ "preset-sub-type" ] <<= getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType );
                 }
             }
         }
diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index e7137926d3dd..c17d2075b52d 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -133,14 +133,14 @@ namespace oox { namespace ppt {
                 break;
             }
             maCond.mnType = aElementToken;
-            maCond.maValue = makeAny( nEnum );
+            maCond.maValue <<= nEnum;
             return this;
         }
         case PPT_TOKEN( tn ):
         {
             maCond.mnType = aElementToken;
             sal_uInt32 nId = rAttribs.getUnsigned( XML_val, 0 );
-            maCond.maValue = makeAny( nId );
+            maCond.maValue <<= nId;
             return this;
         }
         case PPT_TOKEN( tgtEl ):
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index b67eb8b56817..8dc1392bed81 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -383,7 +383,7 @@ void PresentationFragmentHandler::finalizeImport()
 
     // writing back the original PageCount of this document, it can be accessed from the XModel
     // via getArgs after the import.
-    rFilterData["OriginalPageCount"] = makeAny(nPageCount);
+    rFilterData["OriginalPageCount"] <<= nPageCount;
     bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", true);
     OUString aPageRange = rFilterData.getUnpackedValueOrDefault("PageRange", OUString());
 
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 47cb777bda08..3aaa9815d57e 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -84,17 +84,17 @@ namespace oox { namespace ppt {
                     aHSL[ 0 ] = double(one) / 100000;
                     aHSL[ 1 ] = double(two) / 100000;
                     aHSL[ 2 ] = double(three) / 100000;
-                    aColor = Any(aHSL);
+                    aColor <<= aHSL;
                     break;
                 case AnimationColorSpace::RGB:
                     nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16
                         | ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
                         | ( ( ( three * 128 ) / 1000 )  & 0xff );
-                    aColor = Any(nColor);
+                    aColor <<= nColor;
                     break;
                 default:
                     nColor = 0;
-                    aColor = Any( nColor );
+                    aColor <<= nColor;
                     break;
                 }
                 return  aColor;
@@ -188,7 +188,7 @@ namespace oox { namespace ppt {
                     OUString aString;
                     if( maTo >>= aString )
                     {
-                        maTo = makeAny( aString == "visible" );
+                        maTo <<= aString == "visible";
                         if( !maTo.has<sal_Bool>() )
                             SAL_WARN("oox.ppt", "conversion failed" );
                     }
@@ -291,7 +291,7 @@ namespace oox { namespace ppt {
                             }
                             break;
                         }
-                        mpNode->getNodeProperties()[ NP_COMMAND ] = makeAny((sal_Int16)nCommand);
+                        mpNode->getNodeProperties()[ NP_COMMAND ] <<= (sal_Int16)nCommand;
                         if( nCommand == EffectCommands::CUSTOM )
                         {
                             SAL_WARN("oox.ppt", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
@@ -301,7 +301,7 @@ namespace oox { namespace ppt {
                         if( aParamValue.Value.hasValue() )
                         {
                             Sequence< NamedValue > aParamSeq( &aParamValue, 1 );
-                            mpNode->getNodeProperties()[ NP_PARAMETER ] = makeAny( aParamSeq );
+                            mpNode->getNodeProperties()[ NP_PARAMETER ] <<= aParamSeq;
                         }
                     }
                     catch( RuntimeException& )
@@ -424,8 +424,8 @@ namespace oox { namespace ppt {
                 if( isCurrentElement( mnElement ) )
                 {
                     NodePropertyMap & rProps(mpNode->getNodeProperties());
-                    rProps[ NP_DIRECTION ] = makeAny( mnDir == XML_cw );
-                    rProps[ NP_COLORINTERPOLATION ] = makeAny( mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB );
+                    rProps[ NP_DIRECTION ] <<= mnDir == XML_cw;
+                    rProps[ NP_COLORINTERPOLATION ] <<= mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB;
                     const GraphicHelper& rGraphicHelper = getFilter().getGraphicHelper();
                     if( maToClr.isUsed() )
                         mpNode->setTo( Any( maToClr.getColor( rGraphicHelper ) ) );
@@ -522,7 +522,7 @@ namespace oox { namespace ppt {
                         nEnum = AnimationCalcMode::DISCRETE;
                         break;
                     }
-                    aProps[ NP_CALCMODE ] = makeAny(nEnum);
+                    aProps[ NP_CALCMODE ] <<= nEnum;
                 }
                 OUString aStr;
                 aStr = xAttribs->getOptionalValue( XML_from );
@@ -612,7 +612,7 @@ namespace oox { namespace ppt {
                 // TODO what to do with mbZoomContents
                 mbZoomContents = attribs.getBool( XML_zoomContents, false );
                 pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
-                    = makeAny((sal_Int16)AnimationTransformType::SCALE);
+                    <<= (sal_Int16)AnimationTransformType::SCALE;
             }
 
         virtual void onEndElement() override
@@ -690,7 +690,7 @@ namespace oox { namespace ppt {
                 AttributeList attribs( xAttribs );
 
                 pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
-                    = makeAny((sal_Int16)AnimationTransformType::ROTATE);
+                    <<= (sal_Int16)AnimationTransformType::ROTATE;
                 // see also DFF_msofbtAnimateRotationData in
                 // sd/source/filter/ppt/pptinanimations.cxx
                 if(attribs.hasAttribute( XML_by ) )
@@ -735,7 +735,7 @@ namespace oox { namespace ppt {
             : TimeNodeContext( rParent, aElement, xAttribs, pNode )
             {
                 pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
-                    = makeAny((sal_Int16)AnimationTransformType::TRANSLATE);
+                    <<= (sal_Int16)AnimationTransformType::TRANSLATE;
 
                 AttributeList attribs( xAttribs );
                 sal_Int32 nOrigin = xAttribs->getOptionalValueToken( XML_origin, 0 );
@@ -756,7 +756,7 @@ namespace oox { namespace ppt {
                 if (aStr.endsWith("E"))
                     aStr = aStr.copy(0, aStr.getLength() - 1);
                 aStr = aStr.trim();
-                pNode->getNodeProperties()[ NP_PATH ] = makeAny(aStr);
+                pNode->getNodeProperties()[ NP_PATH ] <<= aStr;
                 mnPathEditMode = xAttribs->getOptionalValueToken( XML_pathEditMode, 0 );
                 msPtsTypes = xAttribs->getOptionalValue( XML_ptsTypes );
                 mnAngle = attribs.getInteger( XML_rAng, 0 );
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 9af13d245f0c..a84171949e1f 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -452,13 +452,13 @@ ShapeContextHandler::getShape()
                     sal_Int32 length = aValue.getLength();
                     aValue.realloc(length+1);
 
-                    diagramDrawing[0] = uno::makeAny( mxFilterBase->importFragment( aFragmentPath ) );
-                    diagramDrawing[1] = uno::makeAny( pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
-                                *mxFilterBase, aFragmentPath, "image" )  );
+                    diagramDrawing[0] <<= mxFilterBase->importFragment( aFragmentPath );
+                    diagramDrawing[1] <<= pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
+                                *mxFilterBase, aFragmentPath, "image" );
 
                     beans::PropertyValue* pValue = aValue.getArray();
                     pValue[length].Name = "OOXDrawing";
-                    pValue[length].Value = uno::makeAny( diagramDrawing );
+                    pValue[length].Value <<= diagramDrawing;
 
                     pShapePtr->setDiagramDoms( aValue );
 
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index bfc2f5c4e43b..0ed5f9024ccc 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -107,7 +107,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
                     if (static_cast<long>(basegfx::rad2deg(fRotate)) != NormAngle360(static_cast<long>(nRotation) * 100) / 100)
                     {
                         comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
-                        aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation);
+                        aCustomShapeGeometry["TextPreRotateAngle"] <<= nRotation;
                         xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
                     }
                 }
@@ -181,7 +181,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
             oox::OptValue<OUString> presetShapeName = rAttribs.getString(XML_prst);
             const OUString& preset = presetShapeName.get();
             comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
-            aCustomShapeGeometry["PresetTextWarp"] = uno::makeAny(preset);
+            aCustomShapeGeometry["PresetTextWarp"] <<= preset;
             xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
         }
         break;
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e90ee9093970..8def04fd7fe4 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -395,14 +395,14 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
                         length = aGrabBag.getLength();
                         aGrabBag.realloc( length+1 );
                         aGrabBag[length].Name = "VML-Z-ORDER";
-                        aGrabBag[length].Value = uno::makeAny( maTypeModel.maZIndex.toInt32() );
+                        aGrabBag[length].Value <<= maTypeModel.maZIndex.toInt32();
 
                         if( !s_mso_next_textbox.isEmpty() )
                         {
                             length = aGrabBag.getLength();
                             aGrabBag.realloc( length+1 );
                             aGrabBag[length].Name = "mso-next-textbox";
-                            aGrabBag[length].Value = uno::makeAny( s_mso_next_textbox );
+                            aGrabBag[length].Value <<= s_mso_next_textbox;
                         }
 
                         if( !sLinkChainName.isEmpty() )
@@ -410,13 +410,13 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
                             length = aGrabBag.getLength();
                             aGrabBag.realloc( length+4 );
                             aGrabBag[length].Name   = "TxbxHasLink";
-                            aGrabBag[length].Value   = uno::makeAny( true );
+                            aGrabBag[length].Value   <<= true;
                             aGrabBag[length+1].Name = "Txbx-Id";
-                            aGrabBag[length+1].Value = uno::makeAny( id );
+                            aGrabBag[length+1].Value <<= id;
                             aGrabBag[length+2].Name = "Txbx-Seq";
-                            aGrabBag[length+2].Value = uno::makeAny( seq );
+                            aGrabBag[length+2].Value <<= seq;
                             aGrabBag[length+3].Name = "LinkChainName";
-                            aGrabBag[length+3].Value = uno::makeAny( sLinkChainName );
+                            aGrabBag[length+3].Value <<= sLinkChainName;
                         }
                         propertySet->setPropertyValue( "InteropGrabBag", uno::makeAny(aGrabBag) );
                     }
@@ -704,7 +704,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
             xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= aGrabBag;
             beans::PropertyValue aPair;
             aPair.Name = "mso-layout-flow-alt";
-            aPair.Value = uno::makeAny(maTypeModel.maLayoutFlowAlt);
+            aPair.Value <<= maTypeModel.maLayoutFlowAlt;
             if (aGrabBag.hasElements())
             {
                 sal_Int32 nLength = aGrabBag.getLength();
@@ -806,13 +806,13 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
             if (bFlipX)
             {
                 aPropSequence [nPropertyIndex].Name = "MirroredX";
-                aPropSequence [nPropertyIndex].Value = makeAny (bFlipX);
+                aPropSequence [nPropertyIndex].Value <<= bFlipX;
                 nPropertyIndex++;
             }
             if (bFlipY)
             {
                 aPropSequence [nPropertyIndex].Name = "MirroredY";
-                aPropSequence [nPropertyIndex].Value = makeAny (bFlipY);
+                aPropSequence [nPropertyIndex].Value <<= bFlipY;
             }
             aPropertySet.setAnyProperty(PROP_CustomShapeGeometry, makeAny( aPropSequence ) );
         }
@@ -1270,7 +1270,7 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
         xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
         beans::PropertyValue aPair;
         aPair.Name = "mso-edit-as";
-        aPair.Value = uno::makeAny(maTypeModel.maEditAs);
+        aPair.Value <<= maTypeModel.maEditAs;
        if (aGrabBag.hasElements())
        {
             sal_Int32 nLength = aGrabBag.getLength();
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 395bf1e3c1ea..ac8c51273d77 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -85,13 +85,13 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
         if (rFont.mobBold.has())
         {
             aPropertyValue.Name = "CharWeight";
-            aPropertyValue.Value = uno::makeAny(rFont.mobBold.get() ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL);
+            aPropertyValue.Value <<= rFont.mobBold.get() ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
             aPropVec.push_back(aPropertyValue);
         }
         if (rFont.monSize.has())
         {
             aPropertyValue.Name = "CharHeight";
-            aPropertyValue.Value = uno::makeAny(double(rFont.monSize.get()) / 2.);
+            aPropertyValue.Value <<= double(rFont.monSize.get()) / 2.;
             aPropVec.push_back(aPropertyValue);
         }
         if (rFont.monSpacing.has())
@@ -100,7 +100,7 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
             // Value is not converted to mm100: SvxKerningItem::PutValue() gets
             // called with nMemberId = 0, so no mm100 -> twips conversion will
             // be done there.
-            aPropertyValue.Value = uno::makeAny(sal_Int16(rFont.monSpacing.get()));
+            aPropertyValue.Value <<= sal_Int16(rFont.monSpacing.get());
             aPropVec.push_back(aPropertyValue);
         }
         if (rParagraph.moParaAdjust.has())
@@ -112,13 +112,13 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
                 eAdjust = style::ParagraphAdjust_RIGHT;
 
             aPropertyValue.Name = "ParaAdjust";
-            aPropertyValue.Value = uno::makeAny(eAdjust);
+            aPropertyValue.Value <<= eAdjust;
             aPropVec.push_back(aPropertyValue);
         }
         if (rFont.moColor.has())
         {
             aPropertyValue.Name = "CharColor";
-            aPropertyValue.Value = uno::makeAny(rFont.moColor.get().toUInt32(16));
+            aPropertyValue.Value <<= rFont.moColor.get().toUInt32(16);
             aPropVec.push_back(aPropertyValue);
         }
         xTextAppend->appendTextPortion(aIt->maText, comphelper::containerToSequence(aPropVec));