fdo#75757: Remove inheritance from std::vector

Deprecated comphelper/sequenceasvector.hxx.

Rewritten code using it. Using instead the functions containerToSequence and
sequenceToContainer, found in include/comphelper/sequence.hxx.

One class that inherits from it (in framework/inc/stdtypes.h), and
the code using that has been left.

Signed-off-by: Michael Stahl <mstahl@redhat.com>

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.hxx

Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061

22 files changed, 65 insertions, 51 deletions

diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 76d69d940520..a7b19d9c5bc5 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -159,7 +159,6 @@
 #include <comphelper/classids.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 2604b7a5417c..5b0ea800fa08 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -24,6 +24,7 @@
 #include <ooxml/resourceids.hxx>
 #include <dmapperLoggers.hxx>
 #include <filter/msfilter/util.hxx>
+#include <comphelper/sequence.hxx>
 
 namespace writerfilter {
 
@@ -135,7 +136,7 @@ void BorderHandler::lcl_sprm(Sprm & rSprm)
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
         if( pProperties.get())
         {
-            comphelper::SequenceAsVector<beans::PropertyValue> aSavedGrabBag;
+            std::vector<beans::PropertyValue> aSavedGrabBag;
             if (!m_aInteropGrabBagName.isEmpty())
             {
                 aSavedGrabBag = m_aInteropGrabBag;
@@ -202,7 +203,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName)
     else
         aRet.Name = aName;
 
-    aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
+    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 3210599ebf2d..58e3bc0627a2 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -24,7 +24,6 @@
 #include <memory>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/sequenceasvector.hxx>
 
 namespace writerfilter {
 namespace dmapper
@@ -58,7 +57,7 @@ private:
     bool                                        m_aFilledLines[BORDER_COUNT];
     ::com::sun::star::table::BorderLine2        m_aBorderLines[BORDER_COUNT];
     OUString m_aInteropGrabBagName;
-    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
     void appendGrabBag(const OUString& aKey, const OUString& aValue);
 
     // Properties
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 63e7ed4a2e50..7d4ce2bc8bc8 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/drawing/ShadingPattern.hpp>
 #include <sal/macros.h>
 #include <filter/msfilter/util.hxx>
+#include <comphelper/sequence.hxx>
 #include "dmapperLoggers.hxx"
 
 namespace writerfilter {
@@ -303,7 +304,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag()
 {
     beans::PropertyValue aRet;
     aRet.Name = m_aInteropGrabBagName;
-    aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
+    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index d790625ae120..36ac6fa5c66f 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/sequenceasvector.hxx>
 
 namespace writerfilter {
 namespace dmapper
@@ -41,7 +40,7 @@ private:
     OutputFormat m_OutputFormat;
 
     OUString m_aInteropGrabBagName;
-    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 9d13e22059cf..4e2bf14d0fbb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -63,6 +63,7 @@
 #include <com/sun/star/text/FontEmphasis.hpp>
 #include <comphelper/types.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <filter/msfilter/util.hxx>
 #include <unotools/mediadescriptor.hxx>
 
@@ -2512,7 +2513,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
         resolveSprmProps(*this, rSprm);
 
         TablePropertyMapPtr pPropMap(new TablePropertyMap());
-        pPropMap->Insert(PROP_ROW_CNF_STYLE, uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, ROW_GRAB_BAG);
+        pPropMap->Insert(PROP_ROW_CNF_STYLE, uno::makeAny(uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag))), true, ROW_GRAB_BAG);
         m_pImpl->getTableManager().insertRowProps(pPropMap);
 
         m_pImpl->disableInteropGrabBag();
@@ -2524,7 +2525,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
         resolveSprmProps(*this, rSprm);
 
         TablePropertyMapPtr pPropMap(new TablePropertyMap());
-        pPropMap->Insert(PROP_CELL_CNF_STYLE, uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, CELL_GRAB_BAG);
+        pPropMap->Insert(PROP_CELL_CNF_STYLE, uno::makeAny(uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag))), true, CELL_GRAB_BAG);
         m_pImpl->getTableManager().cellProps(pPropMap);
 
         m_pImpl->disableInteropGrabBag();
@@ -2534,7 +2535,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
     {
         m_pImpl->enableInteropGrabBag("cnfStyle");
         resolveSprmProps(*this, rSprm);
-        rContext->Insert(PROP_PARA_CNF_STYLE, uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList()), true, PARA_GRAB_BAG);
+        rContext->Insert(PROP_PARA_CNF_STYLE, uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, PARA_GRAB_BAG);
         m_pImpl->disableInteropGrabBag();
     }
     break;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 035b0761dc06..60ea3d6aa2be 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -37,6 +37,7 @@
 #include <ConversionHelper.hxx>
 #include <util.hxx>
 #include <osl/diagnose.h>
+#include <comphelper/sequence.hxx>
 
 #ifdef DEBUG_WRITERFILTER
 #include <PropertyMapHelper.hxx>
@@ -287,7 +288,7 @@ bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const Prope
 
 }
 
-bool lcl_extractHoriOrient(comphelper::SequenceAsVector<beans::PropertyValue>& rFrameProperties, sal_Int32& nHoriOrient)
+bool lcl_extractHoriOrient(std::vector<beans::PropertyValue>& rFrameProperties, sal_Int32& nHoriOrient)
 {
     // Shifts the frame left by the given value.
     for (size_t i = 0; i < rFrameProperties.size(); ++i)
@@ -301,7 +302,7 @@ bool lcl_extractHoriOrient(comphelper::SequenceAsVector<beans::PropertyValue>& r
     return false;
 }
 
-void lcl_DecrementHoriOrientPosition(comphelper::SequenceAsVector<beans::PropertyValue>& rFrameProperties, sal_Int32 nAmount)
+void lcl_DecrementHoriOrientPosition(std::vector<beans::PropertyValue>& rFrameProperties, sal_Int32 nAmount)
 {
     // Shifts the frame left by the given value.
     for (size_t i = 0; i < rFrameProperties.size(); ++i)
@@ -317,7 +318,7 @@ void lcl_DecrementHoriOrientPosition(comphelper::SequenceAsVector<beans::Propert
     }
 }
 
-TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo & rInfo, comphelper::SequenceAsVector<beans::PropertyValue>& rFrameProperties)
+TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo & rInfo, std::vector<beans::PropertyValue>& rFrameProperties)
 {
     // will receive the table style if any
     TableStyleSheetEntry* pTableStyle = nullptr;
@@ -983,7 +984,8 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
 #endif
 
     // If we want to make this table a floating one.
-    comphelper::SequenceAsVector<beans::PropertyValue> aFrameProperties = m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
+    std::vector<beans::PropertyValue> aFrameProperties = comphelper::sequenceToContainer<std::vector<beans::PropertyValue> >
+            (m_rDMapper_Impl.getTableManager().getCurrentTablePosition());
     TableInfo aTableInfo;
     aTableInfo.nNestLevel = nestedTableLevel;
     aTableInfo.pTableStyle = endTableGetTableStyle(aTableInfo, aFrameProperties);
@@ -1115,9 +1117,9 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
             sal_Int32 nTableWidth = 0;
             m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH, nTableWidth);
             if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1)
-                m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart, xEnd, aFrameProperties.getAsConstList(), nTableWidth));
+                m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart, xEnd, comphelper::containerToSequence(aFrameProperties), nTableWidth));
             else
-                m_xText->convertToTextFrame(xStart, xEnd, aFrameProperties.getAsConstList());
+                m_xText->convertToTextFrame(xStart, xEnd, comphelper::containerToSequence(aFrameProperties));
         }
     }
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 8ed1b1412d1f..470c7975baa5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -21,7 +21,7 @@
 
 #include <TableManager.hxx>
 #include <PropertyMap.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <vector>
 
 #include <com/sun/star/text/XTextAppendAndConvert.hpp>
 
@@ -83,7 +83,7 @@ class DomainMapperTableHandler : public TableDataHandler
     sal_Int32 m_nCellIndex;
     sal_Int32 m_nRowIndex;
 
-    TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, comphelper::SequenceAsVector<css::beans::PropertyValue>& rFrameProperties);
+    TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, std::vector<css::beans::PropertyValue>& rFrameProperties);
     CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges);
     RowPropertyValuesSeq_t endTableGetRowProperties();
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a77aba65975b..78d236b8a9a5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -82,7 +82,7 @@
 #include <vcl/outdev.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <filter/msfilter/util.hxx>
-#include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/sequence.hxx>
 
 using namespace ::com::sun::star;
 using namespace oox;
@@ -614,7 +614,7 @@ void DomainMapper_Impl::IncorporateTabStop( const DeletableTabStop &  rTabStop )
 
 uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear()
 {
-    comphelper::SequenceAsVector<style::TabStop> aRet;
+    std::vector<style::TabStop> aRet;
     for (DeletableTabStop& rStop : m_aCurrentTabStops)
     {
         if (!rStop.bDeleted)
@@ -622,7 +622,7 @@ uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear()
     }
     m_aCurrentTabStops.clear();
     m_nCurrentTabStopIndex = 0;
-    return aRet.getAsConstList();
+    return comphelper::containerToSequence(aRet);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5f1cd198a351..956e461502e5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -822,7 +822,7 @@ public:
     OUString m_aInteropGrabBagName;
 
     /// A toplevel dmapper grabbag, like 'pPr'.
-    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     /// A sub-grabbag of m_aInteropGrabBag, like 'spacing'.
     std::vector<css::beans::PropertyValue> m_aSubInteropGrabBag;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index a0871565638d..8b9dc63a66c2 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -49,6 +49,7 @@
 #include <rtl/math.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <oox/drawingml/drawingmltypes.hxx>
 
@@ -508,9 +509,13 @@ void GraphicImport::putPropertyToFrameGrabBag( const OUString& sPropertyName, co
 
     if (xSetInfo->hasPropertyByName(aGrabBagPropName))
     {
-        comphelper::SequenceAsVector<beans::PropertyValue> aGrabBag(xSet->getPropertyValue(aGrabBagPropName));
+        //Add pProperty to the end of the Sequence for aGrabBagPropName
+        uno::Sequence<beans::PropertyValue> aTmp;
+        xSet->getPropertyValue(aGrabBagPropName) >>= aTmp;
+        std::vector<beans::PropertyValue> aGrabBag(comphelper::sequenceToContainer<std::vector<beans::PropertyValue> >(aTmp));
         aGrabBag.push_back(pProperty);
-        xSet->setPropertyValue(aGrabBagPropName, uno::makeAny(aGrabBag.getAsConstList()));
+
+        xSet->setPropertyValue(aGrabBagPropName, uno::makeAny(comphelper::containerToSequence(aGrabBag)));
     }
 }
 
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index dce2fd6c69e8..ce5628ed53d0 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -34,6 +34,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/sequence.hxx>
 
 #include "dmapperLoggers.hxx"
 
@@ -264,7 +265,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( )
     };
 
     PropertyNameSupplier& aPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
-    comphelper::SequenceAsVector<beans::PropertyValue> aNumberingProperties;
+    std::vector<beans::PropertyValue> aNumberingProperties;
 
     if( m_nIStartAt >= 0)
         aNumberingProperties.push_back( MAKE_PROPVAL(PROP_START_WITH, (sal_Int16)m_nIStartAt) );
@@ -348,7 +349,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( )
                 beans::PropertyValue( aPropNameSupplier.GetName(PROP_BULLET_FONT_NAME), 0, aPropFont->second, beans::PropertyState_DIRECT_VALUE )
                 );
 
-    return aNumberingProperties.getAsConstList();
+    return comphelper::containerToSequence(aNumberingProperties);
 }
 
 // Add the properties only if they do not already exist in the sequence.
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index a97734eaf55b..438037401508 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -14,6 +14,7 @@
 #include <unotools/datetime.hxx>
 #include <DomainMapper_Impl.hxx>
 #include <SdtHelper.hxx>
+#include <comphelper/sequence.hxx>
 
 namespace writerfilter
 {
@@ -123,7 +124,7 @@ void SdtHelper::createDateControl(OUString& rContentText, beans::PropertyValue a
     aGrabBag["Locale"] <<= m_sLocale.makeStringAndClear();
     aGrabBag["CharFormat"] <<= aCharFormat.Value;
     // merge in properties like ooxml:CT_SdtPr_alias and friends.
-    aGrabBag.update(comphelper::SequenceAsHashMap(m_aGrabBag.getAsConstList()));
+    aGrabBag.update(comphelper::SequenceAsHashMap(comphelper::containerToSequence(m_aGrabBag)));
     // and empty the property list, so they won't end up on the next sdt as well
     m_aGrabBag.clear();
 
@@ -166,7 +167,7 @@ void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue rVal
 
 com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear()
 {
-    com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> aRet = m_aGrabBag.getAsConstList();
+    com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> aRet = comphelper::containerToSequence(m_aGrabBag);
     m_aGrabBag.clear();
     return aRet;
 }
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 210876f0ab6d..462f9a77ce35 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SDTHELPER_HXX
 
 #include <boost/optional.hpp>
+#include <vector>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
@@ -57,7 +58,7 @@ class SdtHelper
     /// Locale string as it comes from the ooxml document.
     OUStringBuffer m_sLocale;
     /// Grab bag to store unsupported SDTs, aiming to save them back on export.
-    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aGrabBag;
+    std::vector<css::beans::PropertyValue> m_aGrabBag;
 
     bool m_bHasElements;
     /// The last stored SDT element is outside paragraphs.
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index f0a537282c92..a8dab40188be 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -42,7 +42,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <dmapperLoggers.hxx>
 
@@ -966,14 +966,14 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY);
                         uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropertySet->getPropertySetInfo();
                         uno::Sequence<beans::Property> aProperties = xPropertySetInfo->getProperties();
-                        comphelper::SequenceAsVector<OUString> aPropertyNames;
+                        std::vector<OUString> aPropertyNames;
                         for (sal_Int32 i = 0; i < aProperties.getLength(); ++i)
                         {
                             aPropertyNames.push_back(aProperties[i].Name);
                         }
 
                         uno::Reference<beans::XPropertyState> xPropertyState(xStyle, uno::UNO_QUERY);
-                        uno::Sequence<beans::PropertyState> aStates = xPropertyState->getPropertyStates(aPropertyNames.getAsConstList());
+                        uno::Sequence<beans::PropertyState> aStates = xPropertyState->getPropertyStates(comphelper::containerToSequence(aPropertyNames));
                         for (sal_Int32 i = 0; i < aStates.getLength(); ++i)
                         {
                             if (aStates[i] == beans::PropertyState_DIRECT_VALUE)
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 553e1088ec69..7b60afc70eeb 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -20,6 +20,7 @@
 #include <TblStylePrHandler.hxx>
 #include <PropertyMap.hxx>
 #include <ooxml/resourceids.hxx>
+#include <comphelper/sequence.hxx>
 
 #include "dmapperLoggers.hxx"
 
@@ -134,7 +135,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
         case NS_ooxml::LN_CT_TrPrBase:
         case NS_ooxml::LN_CT_TcPrBase:
         {
-            comphelper::SequenceAsVector<beans::PropertyValue> aSavedGrabBag;
+            std::vector<beans::PropertyValue> aSavedGrabBag;
             bool bGrabBag = rSprm.getId() == NS_ooxml::LN_CT_PPrBase ||
                 rSprm.getId() == NS_ooxml::LN_EG_RPrBase ||
                 rSprm.getId() == NS_ooxml::LN_CT_TblPrBase ||
@@ -204,7 +205,7 @@ beans::PropertyValue TblStylePrHandler::getInteropGrabBag(const OUString& aName)
     beans::PropertyValue aRet;
     aRet.Name = aName;
 
-    aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
+    aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
     return aRet;
 }
 
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 4eca5f2eac6c..c0694a823bdb 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -25,7 +25,7 @@
 #include <DomainMapper.hxx>
 #include "LoggedResources.hxx"
 #include <memory>
-#include <comphelper/sequenceasvector.hxx>
+#include <vector>
 
 namespace writerfilter {
 namespace dmapper {
@@ -58,7 +58,7 @@ private:
 
     TblStyleType                m_nType;
     PropertyMapPtr              m_pProperties;
-    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 8b3d5e05bc2d..a9626708cf1b 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/drawing/PointSequence.hpp>
+#include <comphelper/sequence.hxx>
 
 #include <ooxml/resourceids.hxx>
 
@@ -124,7 +125,7 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr
 drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
 {
     drawing::PointSequenceSequence aPolyPolygon(1L);
-    drawing::PointSequence aPolygon = mPoints.getAsConstList();
+    drawing::PointSequence aPolygon = comphelper::containerToSequence(mPoints);
     aPolyPolygon[0] = aPolygon;
     return aPolyPolygon;
 }
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 290147278927..55be54eff2c1 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include "LoggedResources.hxx"
 #include <tools/fract.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <vector>
 
 namespace writerfilter {
 namespace dmapper {
@@ -32,7 +32,7 @@ namespace dmapper {
 class WrapPolygon
 {
 public:
-    typedef comphelper::SequenceAsVector<css::awt::Point> Points_t;
+    typedef std::vector<css::awt::Point> Points_t;
     typedef ::std::shared_ptr<WrapPolygon> Pointer_t;
 
 private:
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 28607ea63c71..b937b5d3f9cb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/classids.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/sequence.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <oox/mathml/import.hxx>
 #include <ooxml/resourceids.hxx>
@@ -4628,7 +4629,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
             if (rDrawingObject.nPolyLineCount == 0)
             {
                 uno::Sequence< uno::Sequence<awt::Point> >aPointSequenceSequence(1);
-                aPointSequenceSequence[0] = rDrawingObject.aPolyLinePoints.getAsConstList();
+                aPointSequenceSequence[0] = comphelper::containerToSequence(rDrawingObject.aPolyLinePoints);
                 rDrawingObject.xPropertySet->setPropertyValue("PolyPolygon", uno::Any(aPointSequenceSequence));
             }
         }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index f308f08178e3..09bd60d15df5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -12,6 +12,7 @@
 
 #include <stack>
 #include <queue>
+#include <vector>
 #include <boost/optional.hpp>
 #include <boost/tuple/tuple.hpp>
 
@@ -21,7 +22,6 @@
 #include <oox/helper/graphichelper.hxx>
 #include <oox/mathml/importutils.hxx>
 #include <rtl/strbuf.hxx>
-#include <comphelper/sequenceasvector.hxx>
 
 #include <rtftok/RTFDocument.hxx>
 #include <rtfreferencetable.hxx>
@@ -159,7 +159,7 @@ public:
     sal_Int32 nDhgt;
     sal_Int32 nFLine;
     sal_Int32 nPolyLineCount;
-    comphelper::SequenceAsVector<css::awt::Point> aPolyLinePoints;
+    std::vector<css::awt::Point> aPolyLinePoints;
     bool bHadShapeText;
 };
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 705a400d3008..aa898f3403d9 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -25,6 +25,7 @@
 #include <ooxml/resourceids.hxx>
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
+#include <comphelper/sequence.hxx>
 #include <rtfsdrimport.hxx>
 #include <rtfreferenceproperties.hxx>
 #include <oox/vml/vmlformatting.hxx>
@@ -298,7 +299,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
     uno::Any aAny;
     beans::PropertyValue aPropertyValue;
     awt::Rectangle aViewBox;
-    comphelper::SequenceAsVector<beans::PropertyValue> aPath;
+    std::vector<beans::PropertyValue> aPath;
     // Default line color is black in Word, blue in Writer.
     uno::Any aLineColor = uno::makeAny(COL_BLACK);
     // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer.
@@ -380,7 +381,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             aLineWidth <<= i->second.toInt32()/360;
         else if (i->first == "pVerticies")
         {
-            comphelper::SequenceAsVector<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
+            std::vector<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
             sal_Int32 nSize = 0; // Size of a token (its value is hardwired in the exporter)
             sal_Int32 nCount = 0; // Number of tokens
             sal_Int32 nCharIndex = 0; // Character index
@@ -415,12 +416,12 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             }
             while (nCharIndex >= 0);
             aPropertyValue.Name = "Coordinates";
-            aPropertyValue.Value <<= aCoordinates.getAsConstList();
+            aPropertyValue.Value <<= comphelper::containerToSequence(aCoordinates);
             aPath.push_back(aPropertyValue);
         }
         else if (i->first == "pSegmentInfo")
         {
-            comphelper::SequenceAsVector<drawing::EnhancedCustomShapeSegment> aSegments;
+            std::vector<drawing::EnhancedCustomShapeSegment> aSegments;
             sal_Int32 nSize = 0;
             sal_Int32 nCount = 0;
             sal_Int32 nCharIndex = 0;
@@ -483,7 +484,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             }
             while (nCharIndex >= 0);
             aPropertyValue.Name = "Segments";
-            aPropertyValue.Value <<= aSegments.getAsConstList();
+            aPropertyValue.Value <<= comphelper::containerToSequence(aSegments);
             aPath.push_back(aPropertyValue);
         }
         else if (i->first == "geoLeft")
@@ -799,7 +800,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
     }
 
     // Creating CustomShapeGeometry property
-    comphelper::SequenceAsVector<beans::PropertyValue> aGeometry;
+    std::vector<beans::PropertyValue> aGeometry;
     if (aViewBox.X || aViewBox.Y || aViewBox.Width || aViewBox.Height)
     {
         aViewBox.Width -= aViewBox.X;
@@ -811,11 +812,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
     if (!aPath.empty())
     {
         aPropertyValue.Name = "Path";
-        aPropertyValue.Value <<= aPath.getAsConstList();
+        aPropertyValue.Value <<= comphelper::containerToSequence(aPath);
         aGeometry.push_back(aPropertyValue);
     }
     if (!aGeometry.empty() && xPropertySet.is() && !m_bTextFrame)
-        xPropertySet->setPropertyValue("CustomShapeGeometry", uno::Any(aGeometry.getAsConstList()));
+        xPropertySet->setPropertyValue("CustomShapeGeometry", uno::Any(comphelper::containerToSequence(aGeometry)));
 
     // Set position and size
     if (xShape.is())