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>

18 files changed, 96 insertions, 96 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 80cc8386d2fb..61825ad6ff0b 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -201,7 +201,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName)
     else
         aRet.Name = aName;
 
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     return aRet;
 }
 
@@ -209,7 +209,7 @@ void BorderHandler::appendGrabBag(const OUString& aKey, const OUString& aValue)
 {
     beans::PropertyValue aProperty;
     aProperty.Name = aKey;
-    aProperty.Value = uno::makeAny(aValue);
+    aProperty.Value <<= aValue;
     m_aInteropGrabBag.push_back(aProperty);
 }
 
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 47d329d245fa..58c2a35457cc 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -310,7 +310,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag()
 {
     beans::PropertyValue aRet;
     aRet.Name = m_aInteropGrabBagName;
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 6d223c263f11..bc00c84999de 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -78,17 +78,17 @@ void CellMarginHandler::createGrabBag(const OUString& aName)
 
     uno::Sequence<beans::PropertyValue> aSeq(2);
     aSeq[0].Name = "w";
-    aSeq[0].Value = uno::makeAny(m_nWidth);
+    aSeq[0].Value <<= m_nWidth;
     aSeq[1].Name = "type";
     switch (m_nType)
     {
-        case NS_ooxml::LN_Value_ST_TblWidth_nil: aSeq[1].Value = uno::makeAny(OUString("nil")); break;
-        case NS_ooxml::LN_Value_ST_TblWidth_pct: aSeq[1].Value = uno::makeAny(OUString("pct")); break;
-        case NS_ooxml::LN_Value_ST_TblWidth_dxa: aSeq[1].Value = uno::makeAny(OUString("dxa")); break;
-        case NS_ooxml::LN_Value_ST_TblWidth_auto: aSeq[1].Value = uno::makeAny(OUString("auto")); break;
+        case NS_ooxml::LN_Value_ST_TblWidth_nil: aSeq[1].Value <<= OUString("nil"); break;
+        case NS_ooxml::LN_Value_ST_TblWidth_pct: aSeq[1].Value <<= OUString("pct"); break;
+        case NS_ooxml::LN_Value_ST_TblWidth_dxa: aSeq[1].Value <<= OUString("dxa"); break;
+        case NS_ooxml::LN_Value_ST_TblWidth_auto: aSeq[1].Value <<= OUString("auto"); break;
     }
 
-    aRet.Value = uno::makeAny(aSeq);
+    aRet.Value <<= aSeq;
     m_aInteropGrabBag.push_back(aRet);
 }
 
@@ -167,7 +167,7 @@ beans::PropertyValue CellMarginHandler::getInteropGrabBag()
 {
     beans::PropertyValue aRet;
     aRet.Name = m_aInteropGrabBagName;
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index fe7b9a97b0b4..4aa58d2e364b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -191,9 +191,9 @@ DomainMapper::~DomainMapper()
         // Grab-bag handling
         comphelper::SequenceAsHashMap aProperties;
         // Add the saved w:themeFontLang setting
-        aProperties["ThemeFontLangProps"] = uno::makeAny(m_pImpl->GetSettingsTable()->GetThemeFontLangProperties());
+        aProperties["ThemeFontLangProps"] <<= m_pImpl->GetSettingsTable()->GetThemeFontLangProperties();
         // Add the saved compat settings
-        aProperties["CompatSettings"] = uno::makeAny(m_pImpl->GetSettingsTable()->GetCompatSettings());
+        aProperties["CompatSettings"] <<= m_pImpl->GetSettingsTable()->GetCompatSettings();
         uno::Reference<beans::XPropertySet> xDocProps(m_pImpl->GetTextDocument(), uno::UNO_QUERY);
         if (xDocProps.is())
         {
@@ -1640,12 +1640,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
                 if (aInfo.nSprmId == NS_ooxml::LN_CT_Ruby_rt && aInfo.nHps > 0 )
                 {
                     fVal = double(aInfo.nHps) / 2.;
-                    aVal = uno::makeAny( fVal );
+                    aVal <<= fVal;
                 }
                 else if (aInfo.nSprmId  == NS_ooxml::LN_CT_Ruby_rubyBase && aInfo.nHpsBaseText > 0 )
                 {
                     fVal = double(aInfo.nHpsBaseText) / 2.;
-                    aVal = uno::makeAny( fVal );
+                    aVal <<= fVal;
                 }
                 else if (m_pImpl->m_bInTableStyleRunProps)
                 {
@@ -3718,7 +3718,7 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
 {
     beans::PropertyValue aRet;
     aRet.Name = m_pImpl->m_aInteropGrabBagName;
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag);
 
     m_pImpl->m_aInteropGrabBag.clear();
     m_pImpl->m_aInteropGrabBagName.clear();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 2ce6301e6570..8f368a031316 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -337,36 +337,36 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
             uno::Sequence< beans::PropertyValue  > aGrabBagTS( 10 );
 
             aGrabBagTS[0].Name = "bottomFromText";
-            aGrabBagTS[0].Value = uno::makeAny(pTablePositions->getBottomFromText() );
+            aGrabBagTS[0].Value <<= pTablePositions->getBottomFromText();
 
             aGrabBagTS[1].Name = "horzAnchor";
-            aGrabBagTS[1].Value = uno::makeAny( pTablePositions->getHorzAnchor() );
+            aGrabBagTS[1].Value <<= pTablePositions->getHorzAnchor();
 
             aGrabBagTS[2].Name = "leftFromText";
-            aGrabBagTS[2].Value = uno::makeAny( pTablePositions->getLeftFromText() );
+            aGrabBagTS[2].Value <<= pTablePositions->getLeftFromText();
 
             aGrabBagTS[3].Name = "rightFromText";
-            aGrabBagTS[3].Value = uno::makeAny( pTablePositions->getRightFromText() );
+            aGrabBagTS[3].Value <<= pTablePositions->getRightFromText();
 
             aGrabBagTS[4].Name = "tblpX";
-            aGrabBagTS[4].Value = uno::makeAny( pTablePositions->getX() );
+            aGrabBagTS[4].Value <<= pTablePositions->getX();
 
             aGrabBagTS[5].Name = "tblpXSpec";
-            aGrabBagTS[5].Value = uno::makeAny( pTablePositions->getXSpec() );
+            aGrabBagTS[5].Value <<= pTablePositions->getXSpec();
 
             aGrabBagTS[6].Name = "tblpY";
-            aGrabBagTS[6].Value = uno::makeAny( pTablePositions->getY() );
+            aGrabBagTS[6].Value <<= pTablePositions->getY();
 
             aGrabBagTS[7].Name = "tblpYSpec";
-            aGrabBagTS[7].Value = uno::makeAny( pTablePositions->getYSpec() );
+            aGrabBagTS[7].Value <<= pTablePositions->getYSpec();
 
             aGrabBagTS[8].Name = "topFromText";
-            aGrabBagTS[8].Value = uno::makeAny( pTablePositions->getTopFromText() );
+            aGrabBagTS[8].Value <<= pTablePositions->getTopFromText();
 
             aGrabBagTS[9].Name = "vertAnchor";
-            aGrabBagTS[9].Value = uno::makeAny( pTablePositions->getVertAnchor() );
+            aGrabBagTS[9].Value <<= pTablePositions->getVertAnchor();
 
-            aGrabBag["TablePosition"] = uno::makeAny( aGrabBagTS );
+            aGrabBag["TablePosition"] <<= aGrabBagTS;
         }
 
         boost::optional<PropertyMap::Property> aTableStyleVal = m_aTableProperties->getProperty(META_PROP_TABLE_STYLE_NAME);
@@ -380,7 +380,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
             pTableStyle = dynamic_cast<TableStyleSheetEntry*>( pStyleSheet.get( ) );
             m_aTableProperties->Erase( aTableStyleVal->first );
 
-            aGrabBag["TableStyleName"] = uno::makeAny( sTableStyleName );
+            aGrabBag["TableStyleName"] <<= sTableStyleName;
 
             if( pStyleSheet )
             {
@@ -396,19 +396,19 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                 TableInfo rStyleInfo;
                 if (lcl_extractTableBorderProperty(pMergedProperties, PROP_TOP_BORDER, rStyleInfo, aBorderLine))
                 {
-                    aGrabBag["TableStyleTopBorder"] = uno::makeAny( aBorderLine );
+                    aGrabBag["TableStyleTopBorder"] <<= aBorderLine;
                 }
                 if (lcl_extractTableBorderProperty(pMergedProperties, PROP_BOTTOM_BORDER, rStyleInfo, aBorderLine))
                 {
-                    aGrabBag["TableStyleBottomBorder"] = uno::makeAny( aBorderLine );
+                    aGrabBag["TableStyleBottomBorder"] <<= aBorderLine;
                 }
                 if (lcl_extractTableBorderProperty(pMergedProperties, PROP_LEFT_BORDER, rStyleInfo, aBorderLine))
                 {
-                    aGrabBag["TableStyleLeftBorder"] = uno::makeAny( aBorderLine );
+                    aGrabBag["TableStyleLeftBorder"] <<= aBorderLine;
                 }
                 if (lcl_extractTableBorderProperty(pMergedProperties, PROP_RIGHT_BORDER, rStyleInfo, aBorderLine))
                 {
-                    aGrabBag["TableStyleRightBorder"] = uno::makeAny( aBorderLine );
+                    aGrabBag["TableStyleRightBorder"] <<= aBorderLine;
                 }
 
 #ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 1c1a3c10fcde..7884d3cfdc95 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -78,26 +78,26 @@ bool DomainMapperTableManager::attribute(Id nName, Value& rValue)
         TablePropertyMapPtr pPropMap(new TablePropertyMap());
         pPropMap->Insert(PROP_TBL_LOOK, uno::makeAny<sal_Int32>(rValue.getInt()));
         insertTableProps(pPropMap);
-        m_aTableLook["val"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["val"] <<= (sal_Int32)rValue.getInt();
     }
     break;
     case NS_ooxml::LN_CT_TblLook_noVBand:
-        m_aTableLook["noVBand"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["noVBand"] <<= (sal_Int32)rValue.getInt();
     break;
     case NS_ooxml::LN_CT_TblLook_noHBand:
-        m_aTableLook["noHBand"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["noHBand"] <<= (sal_Int32)rValue.getInt();
     break;
     case NS_ooxml::LN_CT_TblLook_lastColumn:
-        m_aTableLook["lastColumn"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["lastColumn"] <<= (sal_Int32)rValue.getInt();
     break;
     case NS_ooxml::LN_CT_TblLook_lastRow:
-        m_aTableLook["lastRow"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["lastRow"] <<= (sal_Int32)rValue.getInt();
     break;
     case NS_ooxml::LN_CT_TblLook_firstColumn:
-        m_aTableLook["firstColumn"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["firstColumn"] <<= (sal_Int32)rValue.getInt();
     break;
     case NS_ooxml::LN_CT_TblLook_firstRow:
-        m_aTableLook["firstRow"] = uno::makeAny<sal_Int32>(rValue.getInt());
+        m_aTableLook["firstRow"] <<= (sal_Int32)rValue.getInt();
     break;
     default:
         bRet = false;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 334814bc398b..c51659eec07f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -950,7 +950,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
             beans::PropertyValue aRet;
             uno::Sequence<beans::PropertyValue> aGrabBag(1);
             aRet.Name = "ParaFrameProperties";
-            aRet.Value = uno::makeAny(rAppendContext.pLastParagraphProperties->IsFrameMode());
+            aRet.Value <<= rAppendContext.pLastParagraphProperties->IsFrameMode();
             aGrabBag[0] = aRet;
             aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag", aGrabBag));
 
@@ -1256,7 +1256,7 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper
                 for( int i =0; i < len; ++i )
                 {
                     if (aValues[i].Name == "CharHidden")
-                        aValues[i].Value = uno::makeAny(false);
+                        aValues[i].Value <<= false;
                 }
 
             uno::Reference< text::XTextRange > xTextRange;
@@ -2008,7 +2008,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
                             uno::Sequence<beans::PropertyValue> aShapeGrabBag(1);
                             beans::PropertyValue aRet;
                             aRet.Name = "SdtEndBefore";
-                            aRet.Value = uno::makeAny(true);
+                            aRet.Value <<= true;
                             aShapeGrabBag[0] = aRet;
                             xShapePropertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aShapeGrabBag));
                         }
@@ -4187,7 +4187,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                             uno::Sequence<beans::PropertyValue> aValues(1);
                             beans::PropertyValue propertyVal;
                             propertyVal.Name = "Identifier";
-                            propertyVal.Value = uno::makeAny(sCmd);
+                            propertyVal.Value <<= sCmd;
                             aValues[0] = propertyVal;
                                     xTC->setPropertyValue("Fields",
                                             uno::makeAny(aValues));
@@ -4390,13 +4390,13 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
                                 uno::Any aValue(propertyVal.Value);
                                 aValue >>= titleStr;
                                 titleStr = titleStr + rResult;
-                                propertyVal.Value = uno::makeAny(titleStr);
+                                propertyVal.Value <<= titleStr;
                                 aValues[i] = propertyVal;
                             }
                             else
                             {
                                 propertyVal.Name = "Title";
-                                propertyVal.Value = uno::makeAny(rResult);
+                                propertyVal.Value <<= rResult;
                                 aValues[i] = propertyVal;
                             }
                             xFieldProperties->setPropertyValue("Fields",
@@ -4785,7 +4785,7 @@ void  DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties
         if (!m_pSdtHelper->isInteropGrabBagEmpty() && bHasGrabBag && !m_pSdtHelper->isOutsideAParagraph())
         {
             comphelper::SequenceAsHashMap aFrameGrabBag(xPropertySet->getPropertyValue("FrameInteropGrabBag"));
-            aFrameGrabBag["SdtPr"] = uno::makeAny(m_pSdtHelper->getInteropGrabBagAndClear());
+            aFrameGrabBag["SdtPr"] <<= m_pSdtHelper->getInteropGrabBagAndClear();
             xPropertySet->setPropertyValue("FrameInteropGrabBag", uno::makeAny(aFrameGrabBag.getAsConstPropertyValueList()));
         }
     }
@@ -4804,7 +4804,7 @@ void  DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties
                 uno::Sequence<beans::PropertyValue> aFrameGrabBag(1);
                 beans::PropertyValue aRet;
                 aRet.Name = "SdtEndBefore";
-                aRet.Value = uno::makeAny(true);
+                aRet.Value <<= true;
                 aFrameGrabBag[0] = aRet;
                 xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aFrameGrabBag));
             }
@@ -5287,7 +5287,7 @@ void DomainMapper_Impl::appendGrabBag(std::vector<beans::PropertyValue>& rIntero
         return;
     beans::PropertyValue aProperty;
     aProperty.Name = aKey;
-    aProperty.Value = uno::makeAny(aValue);
+    aProperty.Value <<= aValue;
     rInteropGrabBag.push_back(aProperty);
 }
 
@@ -5297,7 +5297,7 @@ void DomainMapper_Impl::appendGrabBag(std::vector<beans::PropertyValue>& rIntero
         return;
     beans::PropertyValue aProperty;
     aProperty.Name = aKey;
-    aProperty.Value = uno::makeAny(comphelper::containerToSequence(rValue));
+    aProperty.Value <<= comphelper::containerToSequence(rValue);
     rValue.clear();
     rInteropGrabBag.push_back(aProperty);
 }
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 3b83bc1c0322..5be3e72d65ee 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -56,7 +56,7 @@ void LatentStyleHandler::lcl_attribute(Id rName, Value& rVal)
     }
     if (bFound)
     {
-        aValue.Value = uno::makeAny(rVal.getString());
+        aValue.Value <<= rVal.getString();
         m_aAttributes.push_back(aValue);
     }
 }
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index f3836351e12b..715215297bde 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -62,10 +62,10 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal)
                 aValue.Name = "type";
                 switch (nIntValue)
                 {
-                    case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value = uno::makeAny(OUString("nil")); break;
-                    case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value = uno::makeAny(OUString("pct")); break;
-                    case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value = uno::makeAny(OUString("dxa")); break;
-                    case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value = uno::makeAny(OUString("auto")); break;
+                    case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value <<= OUString("nil"); break;
+                    case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value <<= OUString("pct"); break;
+                    case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value <<= OUString("dxa"); break;
+                    case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value <<= OUString("auto"); break;
                 }
                 m_aInteropGrabBag.push_back(aValue);
             }
@@ -84,7 +84,7 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal)
             {
                 beans::PropertyValue aValue;
                 aValue.Name = "w";
-                aValue.Value = uno::makeAny(nIntValue);
+                aValue.Value <<= nIntValue;
                 m_aInteropGrabBag.push_back(aValue);
             }
         break;
@@ -133,7 +133,7 @@ beans::PropertyValue MeasureHandler::getInteropGrabBag()
 {
     beans::PropertyValue aRet;
     aRet.Name = m_aInteropGrabBagName;
-    aRet.Value = uno::makeAny( comphelper::containerToSequence(m_aInteropGrabBag) );
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 9a52c416f029..84db1d61819e 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -265,7 +265,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
 
             beans::PropertyValue aValue;
             aValue.Name = "compatSetting";
-            aValue.Value = uno::makeAny(m_pImpl->m_pCurrentCompatSetting);
+            aValue.Value <<= m_pImpl->m_pCurrentCompatSetting;
             m_pImpl->m_aCompatSettings.push_back(aValue);
         }
     }
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index e2ee7b6c9fd0..b35d762c69b7 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -160,7 +160,7 @@ beans::PropertyValue StyleSheetEntry::GetInteropGrabBag()
     aRet.Name = sStyleIdentifierI;
 
     beans::PropertyValues aSeq = GetInteropGrabBagSeq();
-    aRet.Value = uno::makeAny(aSeq);
+    aRet.Value <<= aSeq;
     return aRet;
 }
 
@@ -465,7 +465,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
             {
                 beans::PropertyValue aValue;
                 aValue.Name = "default";
-                aValue.Value = uno::makeAny(m_pImpl->m_pCurrentEntry->bIsDefaultStyle);
+                aValue.Value <<= m_pImpl->m_pCurrentEntry->bIsDefaultStyle;
                 m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
             }
         break;
@@ -474,7 +474,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
             {
                 beans::PropertyValue aValue;
                 aValue.Name = "customStyle";
-                aValue.Value = uno::makeAny(nIntValue != 0);
+                aValue.Value <<= (nIntValue != 0);
                 m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
             }
         break;
@@ -486,7 +486,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
                 TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
                 beans::PropertyValue aValue;
                 aValue.Name = "styleId";
-                aValue.Value = uno::makeAny(sValue);
+                aValue.Value <<= sValue;
                 pTableEntry->AppendInteropGrabBag(aValue);
             }
         break;
@@ -545,7 +545,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
                 beans::PropertyValue aValue;
                 aValue.Name = "name";
-                aValue.Value = uno::makeAny(sStringValue);
+                aValue.Value <<= sStringValue;
                 pTableEntry->AppendInteropGrabBag(aValue);
             }
             break;
@@ -556,7 +556,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
                 beans::PropertyValue aValue;
                 aValue.Name = "basedOn";
-                aValue.Value = uno::makeAny(sStringValue);
+                aValue.Value <<= sStringValue;
                 pTableEntry->AppendInteropGrabBag(aValue);
             }
             break;
@@ -612,7 +612,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                     aStr.append(aBuf.getStr());
 
                     aValue.Name = "rsid";
-                    aValue.Value = uno::makeAny(aStr.makeStringAndClear());
+                    aValue.Value <<= aStr.makeStringAndClear();
                 }
                 break;
                 case NS_ooxml::LN_CT_Style_qFormat:
@@ -627,13 +627,13 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 case NS_ooxml::LN_CT_Style_uiPriority:
                 {
                     aValue.Name = "uiPriority";
-                    aValue.Value = uno::makeAny(OUString::number(nIntValue));
+                    aValue.Value <<= OUString::number(nIntValue);
                 }
                 break;
                 case NS_ooxml::LN_CT_Style_link:
                 {
                     aValue.Name = "link";
-                    aValue.Value = uno::makeAny(sStringValue);
+                    aValue.Value <<= sStringValue;
                 }
                 break;
                 case NS_ooxml::LN_CT_Style_locked:
@@ -744,7 +744,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 pProperties->resolve(*pLatentStyleHandler);
                 beans::PropertyValue aValue;
                 aValue.Name = "lsdException";
-                aValue.Value = uno::makeAny(comphelper::containerToSequence(pLatentStyleHandler->getAttributes()));
+                aValue.Value <<= comphelper::containerToSequence(pLatentStyleHandler->getAttributes());
                 m_pImpl->m_pCurrentEntry->aLsdExceptions.push_back(aValue);
             }
         }
@@ -841,7 +841,7 @@ void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>
             std::vector<beans::PropertyValue>& rLsdExceptions = m_pImpl->m_pCurrentEntry->aLsdExceptions;
             beans::PropertyValue aValue;
             aValue.Name = "lsdExceptions";
-            aValue.Value = uno::makeAny( comphelper::containerToSequence(rLsdExceptions) );
+            aValue.Value <<= comphelper::containerToSequence(rLsdExceptions);
             rLatentStyles.push_back(aValue);
         }
 
@@ -854,7 +854,7 @@ void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>
         auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(xPropertySet->getPropertyValue("InteropGrabBag").get< uno::Sequence<beans::PropertyValue> >());
         beans::PropertyValue aValue;
         aValue.Name = "latentStyles";
-        aValue.Value = uno::makeAny(aLatentStyles);
+        aValue.Value <<= aLatentStyles;
         aGrabBag.push_back(aValue);
         xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag)));
     }
@@ -1131,7 +1131,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
                                 {
                                     beans::PropertyValue aNew;
                                     aNew.Name = "FollowStyle";
-                                    aNew.Value = uno::makeAny(ConvertStyleName((*it)->sStyleIdentifierD));
+                                    aNew.Value <<= ConvertStyleName((*it)->sStyleIdentifierD);
                                     aSortedPropVals.Insert(aNew);
                                     break;
                                 }
@@ -1205,7 +1205,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
                 auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aAny.get< uno::Sequence<beans::PropertyValue> >());
                 beans::PropertyValue aValue;
                 aValue.Name = "tableStyles";
-                aValue.Value = uno::makeAny(comphelper::containerToSequence(aTableStylesVec));
+                aValue.Value <<= comphelper::containerToSequence(aTableStylesVec);
                 aGrabBag.push_back(aValue);
                 xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag)));
             }
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index fa756e44ed6c..236d984e8791 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -458,7 +458,7 @@ beans::PropertyValue TDefTableHandler::getInteropGrabBag(const OUString& aName)
     else
         aRet.Name = aName;
 
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     m_aInteropGrabBag.clear();
     return aRet;
 }
@@ -467,7 +467,7 @@ void TDefTableHandler::appendGrabBag(const OUString& aKey, const OUString& aValu
 {
     beans::PropertyValue aProperty;
     aProperty.Name = aKey;
-    aProperty.Value = uno::makeAny(aValue);
+    aProperty.Value <<= aValue;
     m_aInteropGrabBag.push_back(aProperty);
 }
 
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index e8a7aff4076d..295139583334 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -195,7 +195,7 @@ namespace dmapper {
                     {
                         beans::PropertyValue aValue;
                         aValue.Name = "vAlign";
-                        aValue.Value = uno::makeAny(aVertOrient);
+                        aValue.Value <<= aVertOrient;
                         m_pCurrentInteropGrabBag->push_back(aValue);
                     }
                 }
@@ -369,7 +369,7 @@ namespace dmapper {
                     {
                         beans::PropertyValue aValue;
                         aValue.Name = (nSprmId == NS_ooxml::LN_CT_TblPrBase_tblStyleRowBandSize ? OUString("tblStyleRowBandSize") : OUString("tblStyleColBandSize"));
-                        aValue.Value = uno::makeAny(nIntValue);
+                        aValue.Value <<= nIntValue;
                         m_pCurrentInteropGrabBag->push_back(aValue);
                     }
                     break;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 6664a037bc32..3393e9e345fd 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -194,7 +194,7 @@ void TblStylePrHandler::appendInteropGrabBag(const OUString& aKey, const OUStrin
 {
     beans::PropertyValue aProperty;
     aProperty.Name = aKey;
-    aProperty.Value = uno::makeAny(aValue);
+    aProperty.Value <<= aValue;
     m_aInteropGrabBag.push_back(aProperty);
 }
 
@@ -203,7 +203,7 @@ beans::PropertyValue TblStylePrHandler::getInteropGrabBag(const OUString& aName)
     beans::PropertyValue aRet;
     aRet.Name = aName;
 
-    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+    aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
     return aRet;
 }
 
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 82c96f431770..ef83ebe2686c 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -219,22 +219,22 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc
         comphelper::SequenceAsHashMap aGrabBagProperties;
 
         // Adding the saved Theme DOM
-        aGrabBagProperties["OOXTheme"] = uno::makeAny(pDocument->getThemeDom());
+        aGrabBagProperties["OOXTheme"] <<= pDocument->getThemeDom();
 
         // Adding the saved custom xml DOM
-        aGrabBagProperties["OOXCustomXml"] = uno::makeAny(pDocument->getCustomXmlDomList());
-        aGrabBagProperties["OOXCustomXmlProps"] = uno::makeAny(pDocument->getCustomXmlDomPropsList());
+        aGrabBagProperties["OOXCustomXml"] <<= pDocument->getCustomXmlDomList();
+        aGrabBagProperties["OOXCustomXmlProps"] <<= pDocument->getCustomXmlDomPropsList();
 
         // Adding the saved ActiveX DOM
-        aGrabBagProperties["OOXActiveX"] = uno::makeAny(pDocument->getActiveXDomList());
-        aGrabBagProperties["OOXActiveXBin"] = uno::makeAny(pDocument->getActiveXBinList());
+        aGrabBagProperties["OOXActiveX"] <<= pDocument->getActiveXDomList();
+        aGrabBagProperties["OOXActiveXBin"] <<= pDocument->getActiveXBinList();
 
         // Adding the saved Glossary Documnet DOM to the document's grab bag
-        aGrabBagProperties["OOXGlossary"] = uno::makeAny(pDocument->getGlossaryDocDom());
-        aGrabBagProperties["OOXGlossaryDom"] = uno::makeAny(pDocument->getGlossaryDomList());
+        aGrabBagProperties["OOXGlossary"] <<= pDocument->getGlossaryDocDom();
+        aGrabBagProperties["OOXGlossaryDom"] <<= pDocument->getGlossaryDomList();
 
         // Adding the saved embedding document to document's grab bag
-        aGrabBagProperties["OOXEmbeddings"] = uno::makeAny(pDocument->getEmbeddingsList());
+        aGrabBagProperties["OOXEmbeddings"] <<= pDocument->getEmbeddingsList();
 
         putPropertiesToDocumentGrabBag(aGrabBagProperties);
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 94f2fbba4c7e..f3baab8429f3 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -696,11 +696,11 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
                   if (xDom.is())
                   {
                       uno::Sequence< uno::Any > glossaryTuple (5);
-                      glossaryTuple[0] = uno::makeAny(xDom);
-                      glossaryTuple[1] = uno::makeAny(gId);
-                      glossaryTuple[2] = uno::makeAny(gType);
-                      glossaryTuple[3] = uno::makeAny(gTarget);
-                      glossaryTuple[4] = uno::makeAny(contentType);
+                      glossaryTuple[0] <<= xDom;
+                      glossaryTuple[1] <<= gId;
+                      glossaryTuple[2] <<= gType;
+                      glossaryTuple[3] <<= gTarget;
+                      glossaryTuple[4] <<= contentType;
                       aGlossaryDomList.push_back(glossaryTuple);
                       counter++;
                   }
@@ -788,7 +788,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS
                     if(mxEmbeddings.is())
                     {
                         embeddingsTemp.Name = embeddingsTarget;
-                        embeddingsTemp.Value = uno::makeAny(mxEmbeddings);
+                        embeddingsTemp.Value <<= mxEmbeddings;
                         aEmbeddings.push_back(embeddingsTemp);
                         mxEmbeddings.clear();
                     }
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 72833ee4b43b..00a1776af4e7 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -1040,7 +1040,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
             }
             if (!aName.isEmpty())
             {
-                aSeq[aName] = uno::makeAny(sal_Int32(nParam));
+                aSeq[aName] <<= sal_Int32(nParam);
                 m_xDocumentProperties->setDocumentStatistics(aSeq.getAsConstNamedValueList());
             }
         }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 05212b96a12c..719d82ce35ff 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2704,15 +2704,15 @@ RTFError RTFDocumentImpl::popState()
             OUString aStaticVal = m_aStates.top().pDestinationText->makeStringAndClear();
             uno::Any aAny;
             if (m_aStates.top().aPropType == cppu::UnoType<OUString>::get())
-                aAny = uno::makeAny(aStaticVal);
+                aAny <<= aStaticVal;
             else if (m_aStates.top().aPropType == cppu::UnoType<sal_Int32>::get())
-                aAny = uno::makeAny(aStaticVal.toInt32());
+                aAny <<= aStaticVal.toInt32();
             else if (m_aStates.top().aPropType == cppu::UnoType<bool>::get())
-                aAny = uno::makeAny(aStaticVal.toBoolean());
+                aAny <<= aStaticVal.toBoolean();
             else if (m_aStates.top().aPropType == cppu::UnoType<util::DateTime>::get())
-                aAny = uno::makeAny(getDateTimeFromUserProp(aStaticVal));
+                aAny <<= getDateTimeFromUserProp(aStaticVal);
             else if (m_aStates.top().aPropType == cppu::UnoType<double>::get())
-                aAny = uno::makeAny(aStaticVal.toDouble());
+                aAny <<= aStaticVal.toDouble();
 
             xPropertyContainer->addProperty(rKey, beans::PropertyAttribute::REMOVABLE, aAny);
         }