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
author: Matthew Pottage <matthewpottage@invincitech.com> 2014-10-28 16:50:02 +0000
committer: Michael Stahl <mstahl@redhat.com> 2015-02-06 23:06:58 +0100
commit: 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch)
tree: d626505be68b47a1219d9838f9d5dc35c7271248
parent: 90613f4e47e5e113e5fafb573d832bfcace314e5 (diff)
74 files changed, 272 insertions, 256 deletions
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index b388162fa464..b3f7472a1c57 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -36,8 +37,8 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
         css::configuration::theDefaultProvider::get( rxContext ) );
 
-    ::comphelper::SequenceAsVector< css::uno::Any > lParams;
-    css::beans::PropertyValue                       aParam ;
+    ::std::vector< css::uno::Any > lParams;
+    css::beans::PropertyValue      aParam ;
 
     // set root path
     aParam.Name    = "nodepath";
@@ -65,11 +66,11 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     if (bReadOnly)
         xCFG = xConfigProvider->createInstanceWithArguments(
                 OUString("com.sun.star.configuration.ConfigurationAccess"),
-                lParams.getAsConstList());
+                comphelper::containerToSequence(lParams));
     else
         xCFG = xConfigProvider->createInstanceWithArguments(
                 OUString("com.sun.star.configuration.ConfigurationUpdateAccess"),
-                lParams.getAsConstList());
+                comphelper::containerToSequence(lParams));
 
     return xCFG;
 }
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index d924b7bc02e9..4a1909c8b55f 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -99,7 +99,6 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/util/XRefreshListener.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <config_folders.h>
 #include <cppu/unotype.hxx>
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7402897335eb..1fff9fe76cd0 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -69,7 +69,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/util/ElementChange.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -156,7 +156,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
-    comphelper::SequenceAsVector< css::uno::Type > types;
+    std::vector< css::uno::Type > types;
     types.push_back(cppu::UnoType< css::uno::XInterface >::get());
     types.push_back(cppu::UnoType< css::uno::XWeak >::get());
     types.push_back(cppu::UnoType< css::lang::XTypeProvider >::get());
@@ -199,7 +199,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
             cppu::UnoType< css::container::XHierarchicalNameAccess >::get());
     }
     addTypes(&types);
-    return types.getAsConstList();
+    return comphelper::containerToSequence(types);
 }
 
 css::uno::Sequence< sal_Int8 > Access::getImplementationId()
@@ -231,7 +231,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
-    comphelper::SequenceAsVector< OUString > services;
+    std::vector< OUString > services;
     services.push_back("com.sun.star.configuration.ConfigurationAccess");
     if (getRootAccess()->isUpdate()) {
         services.push_back(
@@ -254,7 +254,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
         }
     }
     addSupportedServiceNames(&services);
-    return services.getAsConstList();
+    return comphelper::containerToSequence(services);
 }
 
 void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
@@ -402,14 +402,14 @@ css::uno::Sequence< OUString > Access::getElementNames()
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
-    comphelper::SequenceAsVector< OUString > names;
+    std::vector< OUString > names;
     for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
              children.begin());
          i != children.end(); ++i)
     {
         names.push_back((*i)->getNameInternal());
     }
-    return names.getAsConstList();
+    return comphelper::containerToSequence(names);
 }
 
 sal_Bool Access::hasByName(OUString const & aName)
@@ -541,14 +541,14 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
     std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
-    comphelper::SequenceAsVector< css::beans::Property > properties;
+    std::vector< css::beans::Property > properties;
     for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
              children.begin());
          i != children.end(); ++i)
     {
         properties.push_back((*i)->asProperty());
     }
-    return properties.getAsConstList();
+    return comphelper::containerToSequence(properties);
 }
 
 css::beans::Property Access::getPropertyByName(OUString const & aName)
@@ -1651,7 +1651,7 @@ void Access::initBroadcasterAndChanges(
     std::vector< css::util::ElementChange > * allChanges)
 {
     assert(broadcaster != 0);
-    comphelper::SequenceAsVector< css::beans::PropertyChangeEvent > propChanges;
+    std::vector< css::beans::PropertyChangeEvent > propChanges;
     bool collectPropChanges = !propertiesChangeListeners_.empty();
     for (Modifications::Node::Children::const_iterator i(
              modifications.children.begin());
@@ -1994,7 +1994,7 @@ void Access::initBroadcasterAndChanges(
     }
     if (!propChanges.empty()) {
         css::uno::Sequence< css::beans::PropertyChangeEvent > seq(
-            propChanges.getAsConstList());
+            comphelper::containerToSequence(propChanges));
         for (PropertiesChangeListeners::iterator i(
                  propertiesChangeListeners_.begin());
              i != propertiesChangeListeners_.end(); ++i)
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 09ed9b0b41c4..91967684b949 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
@@ -75,11 +75,11 @@ void RootAccess::initBroadcaster(
     Modifications::Node const & modifications, Broadcaster * broadcaster)
 {
     assert(broadcaster != 0);
-    comphelper::SequenceAsVector< css::util::ElementChange > changes;
+    std::vector< css::util::ElementChange > changes;
     initBroadcasterAndChanges(
         modifications, broadcaster, changesListeners_.empty() ? 0 : &changes);
     if (!changes.empty()) {
-        css::util::ChangesSet set(changes.getAsConstList());
+        css::util::ChangesSet set(comphelper::containerToSequence(changes));
         for (ChangesListeners::iterator i(changesListeners_.begin());
              i != changesListeners_.end(); ++i)
         {
@@ -193,9 +193,9 @@ css::util::ChangesSet RootAccess::getPendingChanges()
     assert(thisIs(IS_UPDATE));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
-    comphelper::SequenceAsVector< css::util::ElementChange > changes;
+    std::vector< css::util::ElementChange > changes;
     reportChildChanges(&changes);
-    return changes.getAsConstList();
+    return comphelper::containerToSequence(changes);
 }
 
 RootAccess::~RootAccess()
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 487d91400fcf..3fc85e478992 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <rtl/string.h>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
@@ -150,7 +150,7 @@ bool parseValue(
     if ((text.length & 1) != 0) {
         return false;
     }
-    comphelper::SequenceAsVector< sal_Int8 > seq;
+    std::vector< sal_Int8 > seq;
     for (sal_Int32 i = 0; i != text.length;) {
         int n1;
         int n2;
@@ -161,7 +161,7 @@ bool parseValue(
         }
         seq.push_back(static_cast< sal_Int8 >((n1 << 4) | n2));
     }
-    *value = seq.getAsConstList();
+    *value = comphelper::containerToSequence(seq);
     return true;
 }
 
@@ -178,7 +178,7 @@ template< typename T > css::uno::Any parseSingleValue(
 template< typename T > css::uno::Any parseListValue(
     OString const & separator, xmlreader::Span const & text)
 {
-    comphelper::SequenceAsVector< T > seq;
+    std::vector< T > seq;
     xmlreader::Span sep;
     if (separator.isEmpty()) {
         sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
@@ -203,7 +203,7 @@ template< typename T > css::uno::Any parseListValue(
             t.length -= i + sep.length;
         }
     }
-    return css::uno::makeAny(seq.getAsConstList());
+    return css::uno::makeAny(comphelper::containerToSequence(seq));
 }
 
 css::uno::Any parseValue(
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 4c2d5a8df3eb..b4657c1efef8 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -269,7 +269,6 @@
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 3efe0099e5b8..465be9c6f59c 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/saveopt.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -421,9 +421,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* )
                     }
                     sCommand = sCommand.replaceFirst("%1", sReplace);
                     Reference< XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
-                    SequenceAsVector< OUString > lList;
-                    SequenceAsVector< sal_Bool > lAlienList;
-                    SequenceAsVector< sal_Bool > lODFList;
+                    std::vector< OUString > lList;
+                    std::vector< sal_Bool > lAlienList;
+                    std::vector< sal_Bool > lODFList;
                     while(xList->hasMoreElements())
                     {
                         SequenceAsHashMap aFilter(xList->nextElement());
@@ -436,9 +436,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* )
                             lODFList.push_back( isODFFormat( sFilter ) );
                         }
                     }
-                    pImpl->aFilterArr[nData] = lList.getAsConstList();
-                    pImpl->aAlienArr[nData] = lAlienList.getAsConstList();
-                    pImpl->aODFArr[nData] = lODFList.getAsConstList();
+                    pImpl->aFilterArr[nData] = comphelper::containerToSequence(lList);
+                    pImpl->aAlienArr[nData] = comphelper::containerToSequence(lAlienList);
+                    pImpl->aODFArr[nData] = comphelper::containerToSequence(lODFList);
                 }
             }
             aDocTypeLB->SelectEntryPos(0);
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 8d97b0e4af91..abc190339c8b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -32,7 +32,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/awt/Point.hpp>
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::accessibility;
 
 namespace accessibility
 {
-    typedef ::comphelper::SequenceAsVector< beans::PropertyValue > PropertyValueVector;
+    typedef ::std::vector< beans::PropertyValue > PropertyValueVector;
 
     class PropertyValueEqualFunctor : public ::std::binary_function< beans::PropertyValue, beans::PropertyValue, bool >
     {
@@ -970,7 +970,8 @@ namespace accessibility
 
         SolarMutexGuard aGuard;
 
-        PropertyValueVector aDefAttrVec( mpImpl->GetParagraph( 0 ).getDefaultAttributes( RequestedAttributes ) );
+        PropertyValueVector aDefAttrVec(
+                comphelper::sequenceToContainer<PropertyValueVector>(mpImpl->GetParagraph( 0 ).getDefaultAttributes( RequestedAttributes )) );
 
         const sal_Int32 nParaCount = mpImpl->GetParagraphCount();
         for ( sal_Int32 nPara = 1; nPara < nParaCount; ++nPara )
@@ -998,7 +999,7 @@ namespace accessibility
             }
         }
 
-        return aDefAttrVec.getAsConstList();
+        return comphelper::containerToSequence(aDefAttrVec);
     }
 
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
@@ -1028,7 +1029,7 @@ namespace accessibility
             }
         }
 
-        return ::comphelper::concatSequences( aRunAttrSeq, aDiffVec.getAsConstList() );
+        return ::comphelper::concatSequences( aRunAttrSeq, comphelper::containerToSequence(aDiffVec) );
     }
 
     Rectangle AccessibleStaticTextBase::GetParagraphBoundingBox() const
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 5aff8779de91..d0c253c57c2a 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <connectivity/dbconversion.hxx>
 #include "formresid.hrc"
 #include "pcrservices.hxx"
@@ -262,11 +262,11 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > &
                     uno::UNO_QUERY_THROW );
 
                 m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW );
-                comphelper::SequenceAsVector<
+                uno::Sequence<
                     uno::Reference< reflection::XConstantTypeDescription > >
                     cs(m_xTypeDescription->getConstants());
                 std::sort(cs.begin(), cs.end(), CompareConstants());
-                cs >> m_aConstants;
+                m_aConstants = cs;
             }
         }
     }
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index e34b71d03522..5555d475bb02 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/document/FilterConfigRefresh.hpp>
 #include <com/sun/star/uno/Type.h>
 #include <comphelper/enumhelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
@@ -335,7 +336,7 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames()
     {
         FilterCache* pCache = impl_getWorkingCache();
         OUStringList lKeys  = pCache->getItemNames(m_eType);
-        lKeys >> lNames;
+        lNames = comphelper::containerToSequence(lKeys);
     }
     catch(const css::uno::Exception&)
     {
@@ -468,8 +469,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea
              Further its easier to work directly with the return value
              instaed of checking of NULL returns! */
 
-    css::uno::Sequence< OUString > lSubSet;
-    lKeys >> lSubSet;
+    css::uno::Sequence< OUString > lSubSet = comphelper::containerToSequence(lKeys);
     ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSubSet);
     return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY);
 }
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index ef0b66fe686a..36420be2331c 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <osl/diagnose.h>
+#include <comphelper/sequence.hxx>
 
 
 namespace filter{
@@ -234,8 +235,8 @@ bool isSubSet(const css::uno::Any& aSubSet,
                 (aSet    >>= uno_s2)
                )
             {
-                OUStringList stl_s1(uno_s1);
-                OUStringList stl_s2(uno_s2);
+                OUStringList stl_s1(comphelper::sequenceToContainer<OUStringList>(uno_s1));
+                OUStringList stl_s2(comphelper::sequenceToContainer<OUStringList>(uno_s2));
 
                 for (OUStringList::const_iterator it1  = stl_s1.begin();
                                                   it1 != stl_s1.end()  ;
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 06214e6d662c..788036adca39 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <vector>
 #include <comphelper/sequenceashashmap.hxx>
 #include <osl/mutex.hxx>
 
@@ -49,7 +49,7 @@ struct BaseLock
 };
 
 
-typedef ::comphelper::SequenceAsVector< OUString > OUStringList;
+typedef ::std::vector< OUString > OUStringList;
 
 
 
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 0244786cd829..fe774f8b9c91 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 
 
 namespace filter{
@@ -124,13 +125,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
         css::uno::Sequence< css::beans::PropertyValue > lConfig;
         aHandler >> lConfig;
 
-        ::comphelper::SequenceAsVector< css::uno::Any > stlArguments(lArguments);
+        ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector< css::uno::Any > >(lArguments));
         stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig));
 
-        css::uno::Sequence< css::uno::Any > lInitData;
-        stlArguments >> lInitData;
-
-        xInit->initialize(lInitData);
+        xInit->initialize(comphelper::containerToSequence(stlArguments));
     }
 
     return xHandler;
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 828e9f6b42b6..f8d995fc23a7 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <unotools/configpaths.hxx>
@@ -940,7 +940,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
         css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
             css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ) );
 
-        ::comphelper::SequenceAsVector< css::uno::Any > lParams;
+        ::std::vector< css::uno::Any > lParams;
         css::beans::NamedValue aParam;
 
         // set root path
@@ -958,9 +958,11 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
 
         // open it
         if (bReadOnly)
-            xCfg = xConfigProvider->createInstanceWithArguments(SERVICE_CONFIGURATIONACCESS, lParams.getAsConstList());
+            xCfg = xConfigProvider->createInstanceWithArguments(SERVICE_CONFIGURATIONACCESS,
+                    comphelper::containerToSequence(lParams));
         else
-            xCfg = xConfigProvider->createInstanceWithArguments(SERVICE_CONFIGURATIONUPDATEACCESS, lParams.getAsConstList());
+            xCfg = xConfigProvider->createInstanceWithArguments(SERVICE_CONFIGURATIONUPDATEACCESS,
+                    comphelper::containerToSequence(lParams));
 
         // If configuration could not be opened ... but factory method does not throwed an exception
         // trigger throwing of our own CorruptedFilterConfigurationException.
@@ -1228,7 +1230,7 @@ void FilterCache::impl_validateAndOptimize()
 
         CacheItem&     rLoader   = pIt->second;
         css::uno::Any& rTypesReg = rLoader[PROPNAME_TYPES];
-        OUStringList   lTypesReg (rTypesReg);
+        OUStringList   lTypesReg (comphelper::sequenceToContainer<OUStringList>(rTypesReg.get<css::uno::Sequence<OUString> >()));
 
         for (OUStringList::const_iterator pTypesReg  = lTypesReg.begin();
                                           pTypesReg != lTypesReg.end()  ;
@@ -1242,7 +1244,7 @@ void FilterCache::impl_validateAndOptimize()
 
     CacheItem& rDefaultLoader = m_lFrameLoaders[sDefaultFrameLoader];
     rDefaultLoader[PROPNAME_NAME ] <<= sDefaultFrameLoader;
-    rDefaultLoader[PROPNAME_TYPES] <<= lTypes.getAsConstList();
+    rDefaultLoader[PROPNAME_TYPES] <<= comphelper::containerToSequence(lTypes);
 
     OUString sLogOut = sLog.makeStringAndClear();
     OSL_ENSURE(!nErrors, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
@@ -1543,8 +1545,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
     if (!(aVal >>= xUIName) && !xUIName.is())
         return;
 
-    const ::comphelper::SequenceAsVector< OUString >                 lLocales(xUIName->getElementNames());
-          ::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ;
+    const ::std::vector< OUString >                 lLocales(comphelper::sequenceToContainer<::std::vector< OUString >>(
+                                                                xUIName->getElementNames()));
+          ::std::vector< OUString >::const_iterator pLocale ;
           ::comphelper::SequenceAsHashMap                                   lUINames;
 
     for (  pLocale  = lLocales.begin();
@@ -1935,7 +1938,7 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_
     if ((nFlags & FLAGVAL_USESOPTIONS      ) == FLAGVAL_USESOPTIONS      ) lFlagNames.push_back(FLAGNAME_USESOPTIONS      );
     if ((nFlags & FLAGVAL_COMBINED         ) == FLAGVAL_COMBINED         ) lFlagNames.push_back(FLAGNAME_COMBINED         );
 
-    return lFlagNames.getAsConstList();
+    return comphelper::containerToSequence(lFlagNames);
 }
 
 /*-----------------------------------------------
@@ -2097,10 +2100,10 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue,
         case 2:     rItem[PROPNAME_CLIPBOARDFORMAT] <<= ::rtl::Uri::decode(sValue, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8);
                     break;
         // URLPattern
-        case 3:     rItem[PROPNAME_URLPATTERN] <<= impl_tokenizeString(sValue, (sal_Unicode)';').getAsConstList();
+        case 3:     rItem[PROPNAME_URLPATTERN] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';'));
                     break;
         // Extensions
-        case 4:     rItem[PROPNAME_EXTENSIONS] <<= impl_tokenizeString(sValue, (sal_Unicode)';').getAsConstList();
+        case 4:     rItem[PROPNAME_EXTENSIONS] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';'));
                     break;
     }
 }
@@ -2136,7 +2139,7 @@ void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue,
         case 4:     rItem[PROPNAME_FLAGS] <<= sValue.toInt32();
                     break;
         // UserData
-        case 5:     rItem[PROPNAME_USERDATA] <<= impl_tokenizeString(sValue, (sal_Unicode)';').getAsConstList();
+        case 5:     rItem[PROPNAME_USERDATA] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';'));
                     break;
         // FileFormatVersion
         case 6:     rItem[PROPNAME_FILEFORMATVERSION] <<= sValue.toInt32();
@@ -2282,7 +2285,8 @@ OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const
     {
         const OUString& sItem = pIt->first;
         ::comphelper::SequenceAsHashMap lProps(pIt->second);
-        OUStringList                    lTypes(lProps[PROPNAME_TYPES]);
+        OUStringList                    lTypes(
+                comphelper::sequenceToContainer<OUStringList>(lProps[PROPNAME_TYPES].get<css::uno::Sequence<OUString> >()));
 
         if (::std::find(lTypes.begin(), lTypes.end(), sType) != lTypes.end())
             return sItem;
@@ -2302,7 +2306,8 @@ OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) co
     {
         const OUString& sItem = pIt->first;
         ::comphelper::SequenceAsHashMap lProps(pIt->second);
-        OUStringList                    lTypes(lProps[PROPNAME_TYPES]);
+        OUStringList                    lTypes(
+                comphelper::sequenceToContainer<OUStringList>( lProps[PROPNAME_TYPES].get<css::uno::Sequence<OUString> >() ));
         if (::std::find(lTypes.begin(), lTypes.end(), sType) != lTypes.end())
             return sItem;
     }
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 87b829093b44..f6108bf523d9 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/enumhelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <officecfg/Setup.hxx>
 #include <officecfg/TypeDetection/UISort.hxx>
@@ -142,13 +143,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
         css::uno::Sequence< css::beans::PropertyValue > lConfig;
         aFilter >> lConfig;
 
-        ::comphelper::SequenceAsVector< css::uno::Any > stlArguments(lArguments);
+        ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector< css::uno::Any > >(lArguments));
         stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig));
 
-        css::uno::Sequence< css::uno::Any > lInitData;
-        stlArguments >> lInitData;
-
-        xInit->initialize(lInitData);
+        xInit->initialize(comphelper::containerToSequence(stlArguments));
     }
 
     return xFilter;
@@ -180,7 +178,7 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames(
     catch(const css::uno::Exception&)
         { lUNOFilters.clear(); }
 
-    return lUNOFilters.getAsConstList();
+    return comphelper::containerToSequence(lUNOFilters);
 }
 
 
@@ -234,7 +232,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
     // pack list of item names as an enum list
     // Attention: Do not return empty reference for empty list!
     // The outside check "hasMoreElements()" should be enough, to detect this state :-)
-    css::uno::Sequence< OUString > lSet = lEnumSet.getAsConstList();
+    css::uno::Sequence< OUString > lSet = comphelper::containerToSequence(lEnumSet);
     ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSet);
     return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY);
 }
@@ -477,7 +475,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const
     // <- SAFE ----------------------
 
     css::uno::Reference< css::container::XNameAccess > xModuleConfig = officecfg::Setup::Office::Factories::get(xContext);
-    OUStringList lModules(xModuleConfig->getElementNames());
+    OUStringList lModules(comphelper::sequenceToContainer<OUStringList>(xModuleConfig->getElementNames()));
     return lModules;
 }
 
@@ -558,7 +556,8 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString&
             // Note: conversion of the returned Any to OUStringList throws
             // an IllegalArgumentException if the type does not match ...
             // but it resets the OUStringList to a length of 0 if the Any is empty!
-            OUStringList lSortedFilters(xModule->getByName(PROPNAME_SORTEDFILTERLIST));
+            OUStringList lSortedFilters(
+                    comphelper::sequenceToContainer<OUStringList>(xModule->getByName(PROPNAME_SORTEDFILTERLIST).get<css::uno::Sequence<OUString> >()));
             return lSortedFilters;
         }
     }
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index d14188851f3b..320a9918be57 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 
 
 namespace filter{
@@ -121,13 +122,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
         css::uno::Sequence< css::beans::PropertyValue > lConfig;
         aLoader >> lConfig;
 
-        ::comphelper::SequenceAsVector< css::uno::Any > stlArguments(lArguments);
+        ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector<css::uno::Any> >(lArguments));
         stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig));
 
-        css::uno::Sequence< css::uno::Any > lInitData;
-        stlArguments >> lInitData;
-
-        xInit->initialize(lInitData);
+        xInit->initialize(comphelper::containerToSequence(stlArguments));
     }
 
     return xLoader;
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index a7d306892eda..15ba4d085a97 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -33,6 +33,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 
 #define DEBUG_TYPE_DETECTION 0
 
@@ -679,8 +680,8 @@ bool TypeDetection::impl_getPreselectionForType(
 
         // otherwise we must know, if it matches to the given URL really.
         // especially if it matches by its extension or pattern registration.
-        OUStringList lExtensions(aType[PROPNAME_EXTENSIONS]);
-        OUStringList lURLPattern(aType[PROPNAME_URLPATTERN]);
+        OUStringList lExtensions(comphelper::sequenceToContainer<OUStringList>(aType[PROPNAME_EXTENSIONS].get<css::uno::Sequence<OUString> >() ));
+        OUStringList lURLPattern(comphelper::sequenceToContainer<OUStringList>(aType[PROPNAME_URLPATTERN].get<css::uno::Sequence<OUString> >() ));
 
         for (OUStringList::const_iterator pIt  = lExtensions.begin();
                                           pIt != lExtensions.end()  ;
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index f5f1fe2ddaff..6906d29ae07e 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include "filepickereventnotification.hxx"
 
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 
 // namespace directives
@@ -382,9 +382,9 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R
     if (c < 2)
         return lSource;
 
-    const OUString                                   sPath  = lSource[0];
-          ::comphelper::SequenceAsVector< OUString > lTarget;
-          ::sal_Int32                                       i      = 1;
+    const OUString                  sPath  = lSource[0];
+          ::std::vector< OUString > lTarget;
+          ::sal_Int32               i      = 1;
     for (i=1; i<c; ++i)
     {
         const OUString sFile = lSource[i];
@@ -406,7 +406,7 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R
         }
     }
 
-    return lTarget.getAsConstList();
+    return comphelper::containerToSequence(lTarget);
 }
 
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 9716c1e564ee..54f30690767a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #ifdef __MINGW32__
@@ -85,7 +85,7 @@ namespace vista{
 static const ::sal_Int16 INVALID_CONTROL_ID     = -1;
 static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
 
-typedef ::comphelper::SequenceAsVector< OUString > TStringList;
+typedef ::std::vector< OUString > TStringList;
 
 // Guids used for IFileDialog::SetClientGuid
 static const GUID CLIENTID_FILEDIALOG_SIMPLE        = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
@@ -864,7 +864,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
         }
     }
 
-    rRequest->setArgument(PROP_SELECTED_FILES, lFiles.getAsConstList());
+    rRequest->setArgument(PROP_SELECTED_FILES, comphelper::containerToSequence(lFiles));
 }
 
 
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 730e609b9868..77327232b201 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <officecfg/Setup.hxx>
 #include <unotools/configpaths.hxx>
 #include <svtools/acceleratorexecute.hxx>
@@ -91,7 +92,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
     SolarMutexGuard g;
     AcceleratorCache&          rCache = impl_getCFG();
     AcceleratorCache::TKeyList lKeys  = rCache.getAllKeys();
-    return lKeys.getAsConstList();
+    return comphelper::containerToSequence(lKeys);
 }
 
 OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
@@ -166,7 +167,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
                 static_cast< ::cppu::OWeakObject* >(this));
 
     AcceleratorCache::TKeyList lKeys  = rCache.getKeysByCommand(sCommand);
-    return lKeys.getAsConstList();
+    return comphelper::containerToSequence(lKeys);
 }
 
 css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
@@ -543,7 +544,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
     for ( pIt  = lSecondaryKeys.begin(); pIt != pEnd; ++pIt )
         lKeys.push_back(*pIt);
 
-    return lKeys.getAsConstList();
+    return comphelper::containerToSequence(lKeys);
 }
 
 OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
@@ -716,7 +717,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
     for (pIt = lSecondaryKeys.begin(); pIt != lSecondaryKeys.end(); ++pIt)
         lKeys.push_back(*pIt);
 
-    return lKeys.getAsConstList();
+    return comphelper::containerToSequence(lKeys);
 }
 
 AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const AcceleratorCache::TKeyList& lKeys)
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 19f0381f8218..9d0464faf4d4 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/AppDispatchProvider.hpp>
 
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 namespace framework{
 
@@ -47,7 +47,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
     sal_Int32                                                                             c1        = lProvider.getLength();
     sal_Int32                                                                             i1        = 0;
 
-    ::comphelper::SequenceAsVector< sal_Int16 > lGroups;
+    ::std::vector< sal_Int16 > lGroups;
 
     for (i1=0; i1<c1; ++i1)
     {
@@ -62,13 +62,14 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
         for (i2=0; i2<c2; ++i2)
         {
             const sal_Int16&                                                  rGroup = lProviderGroups[i2];
-                  ::comphelper::SequenceAsVector< sal_Int16 >::const_iterator pGroup = ::std::find(lGroups.begin(), lGroups.end(), rGroup);
+                  ::std::vector< sal_Int16 >::const_iterator pGroup =
+                            ::std::find(lGroups.begin(), lGroups.end(), rGroup);
             if (pGroup == lGroups.end())
                 lGroups.push_back(rGroup);
         }
     }
 
-    return lGroups.getAsConstList();
+    return ::comphelper::containerToSequence(lGroups);
 }
 
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 47e0d86ce81e..07c0cf877b94 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -25,7 +25,7 @@
 
 #include <com/sun/star/awt/KeyEvent.hpp>
 
-#include <comphelper/sequenceasvector.hxx>
+#include <vector>
 
 // definition
 
@@ -51,7 +51,7 @@ class AcceleratorCache
         /** TODO document me
             commands -> keys
         */
-        typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList;
+        typedef ::std::vector< css::awt::KeyEvent > TKeyList;
         typedef BaseHash< TKeyList > TCommand2Keys;
 
         /** TODO document me
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index cdb176359dd8..f1c34b97894b 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -33,7 +33,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/enumhelper.hxx>
 
 #include <boost/noncopyable.hpp>
@@ -344,7 +344,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
 {
     ::comphelper::SequenceAsHashMap lSearchProps(lProperties);
     const css::uno::Sequence< OUString > lModules = getElementNames();
-    ::comphelper::SequenceAsVector< css::uno::Any > lResult;
+    ::std::vector< css::uno::Any > lResult;
 
     for (sal_Int32 i = 0; i < lModules.getLength(); ++i)
     {
@@ -359,7 +359,8 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
         }
     }
 
-    ::comphelper::OAnyEnumeration*                      pEnum = new ::comphelper::OAnyEnumeration(lResult.getAsConstList());
+    ::comphelper::OAnyEnumeration*                      pEnum =
+                 new ::comphelper::OAnyEnumeration(comphelper::containerToSequence(lResult));
     css::uno::Reference< css::container::XEnumeration > xEnum(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY_THROW);
     return xEnum;
 }
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index c1be8114df7a..be2bf0509499 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
-#include <comphelper/sequenceasvector.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/comphelperdllapi.h>
diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
index 48b9e1a16f01..6b85e7233438 100644
--- a/include/comphelper/sequenceasvector.hxx
+++ b/include/comphelper/sequenceasvector.hxx
@@ -26,6 +26,10 @@
 
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 
+/** This should not be used. Use the functions in
+ * comphelper/vectortosequence.hxx
+ * @deprecated
+ */
 
 namespace comphelper{
 
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 1215a6d8d636..f5bc9633a5e3 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -10,7 +10,7 @@
 #include <config_folders.h>
 #include <rtl/bootstrap.hxx>
 #include <tools/stream.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 #include "drawingml/customshapeproperties.hxx"
 #include "oox/token/tokenmap.hxx"
@@ -22,7 +22,7 @@ namespace
 {
 
 // Parses a string like: Value = (any) { (long) 19098 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj"
-void lcl_parseAdjustmentValue(comphelper::SequenceAsVector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
+void lcl_parseAdjustmentValue(std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
 {
     sal_Int32 nIndex = 0;
     drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentValue;
@@ -49,7 +49,7 @@ void lcl_parseAdjustmentValue(comphelper::SequenceAsVector<drawing::EnhancedCust
 }
 
 // Parses a string like: { Value = (any) { (long) 19098 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj" }, { Value = ..., State = ..., Name = ... }
-void lcl_parseAdjustmentValues(comphelper::SequenceAsVector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
+void lcl_parseAdjustmentValues(std::vector<drawing::EnhancedCustomShapeAdjustmentValue>& rAdjustmentValues, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
@@ -220,7 +220,7 @@ drawing::EnhancedCustomShapeTextFrame lcl_parseEnhancedCustomShapeTextFrame(cons
 
 // Parses a string like: Name = "Position", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parseHandlePosition(comphelper::SequenceAsVector<beans::PropertyValue>& rHandle, const OString& rValue)
+void lcl_parseHandlePosition(std::vector<beans::PropertyValue>& rHandle, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -261,7 +261,7 @@ void lcl_parseHandlePosition(comphelper::SequenceAsVector<beans::PropertyValue>&
 
 // Parses a string like: Name = "RangeYMaximum", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parseHandleRange(comphelper::SequenceAsVector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
+void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -314,7 +314,7 @@ void lcl_parseHandleRange(comphelper::SequenceAsVector<beans::PropertyValue>& rH
 }
 
 // Parses a string like: Name = "RefY", Handle = (long) 0, Value = (any) { (long) 0 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
-void lcl_parseHandleRef(comphelper::SequenceAsVector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
+void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName)
 {
     static const char aExpectedXPrefix[] = "Name = \"RefX\", Handle = (long) 0, Value = (any) { (long) ";
     static const char aExpectedYPrefix[] = "Name = \"RefY\", Handle = (long) 0, Value = (any) { (long) ";
@@ -333,7 +333,7 @@ void lcl_parseHandleRef(comphelper::SequenceAsVector<beans::PropertyValue>& rHan
 
 uno::Sequence<beans::PropertyValue> lcl_parseHandle(const OString& rValue)
 {
-    comphelper::SequenceAsVector<beans::PropertyValue> aRet;
+    std::vector<beans::PropertyValue> aRet;
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
     for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
@@ -373,10 +373,10 @@ uno::Sequence<beans::PropertyValue> lcl_parseHandle(const OString& rValue)
             }
         }
     }
-    return aRet.getAsConstList();
+    return comphelper::containerToSequence(aRet);
 }
 
-void lcl_parseHandles(comphelper::SequenceAsVector< uno::Sequence<beans::PropertyValue> >& rHandles, const OString& rValue)
+void lcl_parseHandles(std::vector< uno::Sequence<beans::PropertyValue> >& rHandles, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
@@ -400,7 +400,7 @@ void lcl_parseHandles(comphelper::SequenceAsVector< uno::Sequence<beans::Propert
     }
 }
 
-void lcl_parseEquations(comphelper::SequenceAsVector<OUString>& rEquations, const OString& rValue)
+void lcl_parseEquations(std::vector<OUString>& rEquations, const OString& rValue)
 {
     bool bInString = false;
     sal_Int32 nStart = 0;
@@ -419,9 +419,9 @@ void lcl_parseEquations(comphelper::SequenceAsVector<OUString>& rEquations, cons
     }
 }
 
-void lcl_parsePathCoordinateValues(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathCoordinateValues(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
-    comphelper::SequenceAsVector<drawing::EnhancedCustomShapeParameterPair> aPairs;
+    std::vector<drawing::EnhancedCustomShapeParameterPair> aPairs;
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
     for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
@@ -442,13 +442,13 @@ void lcl_parsePathCoordinateValues(comphelper::SequenceAsVector<beans::PropertyV
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "Coordinates";
-    aPropertyValue.Value = uno::makeAny(aPairs.getAsConstList());
+    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aPairs));
     rPath.push_back(aPropertyValue);
 }
 
 // Parses a string like: Name = "Coordinates", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parsePathCoordinates(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathCoordinates(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -483,9 +483,9 @@ void lcl_parsePathCoordinates(comphelper::SequenceAsVector<beans::PropertyValue>
     }
 }
 
-void lcl_parsePathSegmentValues(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathSegmentValues(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
-    comphelper::SequenceAsVector<drawing::EnhancedCustomShapeSegment> aSegments;
+    std::vector<drawing::EnhancedCustomShapeSegment> aSegments;
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
     for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
@@ -506,13 +506,13 @@ void lcl_parsePathSegmentValues(comphelper::SequenceAsVector<beans::PropertyValu
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "Segments";
-    aPropertyValue.Value = uno::makeAny(aSegments.getAsConstList());
+    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSegments));
     rPath.push_back(aPropertyValue);
 }
 
 // Parses a string like: Name = "Segments", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parsePathSegments(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathSegments(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -547,9 +547,9 @@ void lcl_parsePathSegments(comphelper::SequenceAsVector<beans::PropertyValue>& r
     }
 }
 
-void lcl_parsePathTextFrameValues(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathTextFrameValues(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
-    comphelper::SequenceAsVector<drawing::EnhancedCustomShapeTextFrame> aTextFrames;
+    std::vector<drawing::EnhancedCustomShapeTextFrame> aTextFrames;
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
     for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
@@ -570,13 +570,13 @@ void lcl_parsePathTextFrameValues(comphelper::SequenceAsVector<beans::PropertyVa
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "TextFrames";
-    aPropertyValue.Value = uno::makeAny(aTextFrames.getAsConstList());
+    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aTextFrames));
     rPath.push_back(aPropertyValue);
 }
 
 // Parses a string like: Name = "TextFrames", Handle = (long) 0, Value = (any) { ... }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE
 // where "{ ... }" may contain "," as well.
-void lcl_parsePathTextFrames(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathTextFrames(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -611,9 +611,9 @@ void lcl_parsePathTextFrames(comphelper::SequenceAsVector<beans::PropertyValue>&
     }
 }
 
-void lcl_parsePathSubViewSizeValues(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathSubViewSizeValues(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
-    comphelper::SequenceAsVector<awt::Size> aSizes;
+    std::vector<awt::Size> aSizes;
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
     for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
@@ -634,11 +634,11 @@ void lcl_parsePathSubViewSizeValues(comphelper::SequenceAsVector<beans::Property
 
     beans::PropertyValue aPropertyValue;
     aPropertyValue.Name = "SubViewSize";
-    aPropertyValue.Value = uno::makeAny(aSizes.getAsConstList());
+    aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSizes));
     rPath.push_back(aPropertyValue);
 }
 
-void lcl_parsePathSubViewSize(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePathSubViewSize(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     bool bIgnore = false;
@@ -673,7 +673,7 @@ void lcl_parsePathSubViewSize(comphelper::SequenceAsVector<beans::PropertyValue>
     }
 }
 
-void lcl_parsePath(comphelper::SequenceAsVector<beans::PropertyValue>& rPath, const OString& rValue)
+void lcl_parsePath(std::vector<beans::PropertyValue>& rPath, const OString& rValue)
 {
     sal_Int32 nLevel = 0;
     sal_Int32 nStart = 0;
@@ -743,13 +743,13 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine != "([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) {}")
                 {
-                    comphelper::SequenceAsVector<drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentValues;
+                    std::vector<drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentValues;
                     OString aExpectedPrefix("([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
                     OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                     lcl_parseAdjustmentValues(aAdjustmentValues, aValue);
-                    aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjustmentValues.getAsConstList());
+                    aPropertyMap.setProperty(PROP_AdjustmentValues, comphelper::containerToSequence(aAdjustmentValues));
                 }
                 else
                     aPropertyMap.setProperty(PROP_AdjustmentValues, uno::Sequence<OUString>(0));
@@ -759,13 +759,13 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine != "([]string) {}")
                 {
-                    comphelper::SequenceAsVector<OUString> aEquations;
+                    std::vector<OUString> aEquations;
                     OString aExpectedPrefix("([]string) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
                     OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                     lcl_parseEquations(aEquations, aValue);
-                    aPropertyMap.setProperty(PROP_Equations, aEquations.getAsConstList());
+                    aPropertyMap.setProperty(PROP_Equations, comphelper::containerToSequence(aEquations));
                 }
                 else
                     aPropertyMap.setProperty(PROP_Equations, uno::Sequence<OUString>(0));
@@ -775,13 +775,13 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine != "([][]com.sun.star.beans.PropertyValue) {}")
                 {
-                    comphelper::SequenceAsVector< uno::Sequence<beans::PropertyValue> > aHandles;
+                    std::vector< uno::Sequence<beans::PropertyValue> > aHandles;
                     OString aExpectedPrefix("([][]com.sun.star.beans.PropertyValue) { ");
                     assert(aLine.startsWith(aExpectedPrefix));
 
                     OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                     lcl_parseHandles(aHandles, aValue);
-                    aPropertyMap.setProperty(PROP_Handles, aHandles.getAsConstList());
+                    aPropertyMap.setProperty(PROP_Handles, comphelper::containerToSequence(aHandles));
                 }
                 else
                     aPropertyMap.setProperty(PROP_Handles, uno::Sequence<OUString>(0));
@@ -812,10 +812,10 @@ void CustomShapeProperties::initializePresetDataMap()
                 OString aExpectedPrefix("([]com.sun.star.beans.PropertyValue) { ");
                 assert(aLine.startsWith(aExpectedPrefix));
 
-                comphelper::SequenceAsVector<beans::PropertyValue> aPathValue;
+                std::vector<beans::PropertyValue> aPathValue;
                 OString aValue = aLine.copy(aExpectedPrefix.getLength(), aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
                 lcl_parsePath(aPathValue, aValue);
-                aPropertyMap.setProperty(PROP_Path, aPathValue.getAsConstList());
+                aPropertyMap.setProperty(PROP_Path, comphelper::containerToSequence(aPathValue));
             }
             else if (aLine == "Type")
             {
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index d8240dc421ae..e242eac90603 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/CipherID.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <comphelper/sequence.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
@@ -351,7 +352,7 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName )
                 isEmpty), aSequence.end());
 
             bIgnoreEncryptData = false;
-            rManVector.push_back ( aSequence.getAsConstList() );
+            rManVector.push_back ( comphelper::containerToSequence(aSequence) );
 
             aSequence.clear();
         }
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 965a33b3953a..dd7498bb68b1 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <comphelper/sequenceasvector.hxx>
 #include <vector>
 
 #include <HashMaps.hxx>
@@ -55,7 +54,7 @@ typedef ::std::vector< ManifestScopeEntry > ManifestStack;
 class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
 {
 protected:
-    comphelper::SequenceAsVector< com::sun::star::beans::PropertyValue > aSequence;
+    std::vector< com::sun::star::beans::PropertyValue > aSequence;
     ManifestStack aStack;
     bool bIgnoreEncryptData;
     sal_Int32 nDerivedKeySize;
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 968292a54154..32b65f4e61b7 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 
 #include "sax/tools/converter.hxx"
-#include "comphelper/sequenceasvector.hxx"
+#include <comphelper/sequence.hxx>
 #include "sal/log.hxx"
 
 
@@ -664,23 +664,23 @@ void doTestDecodeBase64(const uno::Sequence<sal_Int8>& aPass, char const*const p
 
 void ConverterTest::testBase64()
 {
-    comphelper::SequenceAsVector< sal_Int8 > tempSeq(4);
+    std::vector< sal_Int8 > tempSeq(4);
     for(sal_Int8 i = 0; i<4; ++i)
         tempSeq.push_back(i);
-    uno::Sequence< sal_Int8 > tempSequence = tempSeq.getAsConstList();
+    uno::Sequence< sal_Int8 > tempSequence = comphelper::containerToSequence(tempSeq);
     doTestEncodeBase64("AAAAAAABAgM=", tempSequence);
     doTestDecodeBase64(tempSequence, "AAAAAAABAgM=");
     tempSeq[0] = sal_Int8(5);
     tempSeq[1] = sal_Int8(2);
     tempSeq[2] = sal_Int8(3);
-    tempSequence = tempSeq.getAsConstList();
+    tempSequence = comphelper::containerToSequence(tempSeq);
     doTestEncodeBase64("BQIDAAABAgM=", tempSequence);
     doTestDecodeBase64(tempSequence, "BQIDAAABAgM=");
     tempSeq[0] = sal_Int8(sal_uInt8(200));
     tempSeq[1] = sal_Int8(31);
     tempSeq[2] = sal_Int8(77);
     tempSeq[3] = sal_Int8(111);
-    tempSequence = tempSeq.getAsConstList();
+    tempSequence = comphelper::containerToSequence(tempSeq);
     doTestEncodeBase64("yB9NbwABAgM=", tempSequence);
     doTestDecodeBase64(tempSequence, "yB9NbwABAgM=");
 }
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 394af442ff21..4c1848bb08e7 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/xml/sax/FastTokenHandler.hpp>
 #include <rtl/math.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <string.h>
 
@@ -31,7 +31,7 @@
 #include <set>
 #endif
 
-using ::comphelper::SequenceAsVector;
+using ::std::vector;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::xml::Attribute;
@@ -444,7 +444,7 @@ namespace sax_fastparser {
 
     void FastSaxSerializer::ForSort::setCurrentElement( sal_Int32 nElement )
     {
-        SequenceAsVector< sal_Int32 > aOrder( maOrder );
+        vector< sal_Int32 > aOrder( comphelper::sequenceToContainer<vector<sal_Int32> >(maOrder) );
         if( std::find( aOrder.begin(), aOrder.end(), nElement ) != aOrder.end() )
         {
             mnCurrentElement = nElement;
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index bf2e4b8c60ef..e6aa81a23a91 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -486,7 +486,6 @@
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <comphelper/stillreadwriteinteraction.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 27fefa9f6dc6..d684f8bdeeed 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -46,7 +46,6 @@
 #include <rtl/ustring.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/synchronousdispatch.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index c5803cd7d216..527354b44e86 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -93,6 +93,7 @@
 #include <helpid.hrc>
 #include <sfxlocal.hrc>
 #include <rtl/strbuf.hxx>
+#include <comphelper/sequence.hxx>
 
 #ifdef UNX
 #include <errno.h>
@@ -1295,7 +1296,7 @@ void FileDialogHelper_Impl::implStartExecute()
 }
 
 void lcl_saveLastURLs(std::vector<OUString>& rpURLList,
-                      ::comphelper::SequenceAsVector< OUString >& lLastURLs )
+                      ::std::vector< OUString >& lLastURLs )
 {
     lLastURLs.clear();
     for(std::vector<OUString>::iterator i = rpURLList.begin(); i != rpURLList.end(); ++i)
@@ -2395,7 +2396,7 @@ OUString FileDialogHelper::GetPath() const
 Sequence < OUString > FileDialogHelper::GetMPath() const
 {
     if ( mpImp->mlLastURLs.size() > 0)
-        return mpImp->mlLastURLs.getAsConstList();
+        return comphelper::containerToSequence(mpImp->mlLastURLs);
 
     if ( mpImp->mxFileDlg.is() )
         return mpImp->mxFileDlg->getFiles();
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index e20242102d87..cfd8e3ad89bb 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <comphelper/sequenceasvector.hxx>
 
 class SfxFilterMatcher;
 class GraphicFilter;
@@ -56,7 +55,7 @@ namespace sfx2
         FileDialogHelper*           mpAntiImpl;
         vcl::Window*                     mpPreferredParentWindow;
 
-        ::comphelper::SequenceAsVector< OUString > mlLastURLs;
+        ::std::vector< OUString > mlLastURLs;
 
         OUString             maPath;
         OUString             maFileName;
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index ab7de098e7d3..211d21f66483 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -67,7 +67,6 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index cb6799fbfd9f..228f57878a34 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/interaction.hxx>
 #include <comphelper/makesequence.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/storagehelper.hxx>
 
 #include <sfx2/docfile.hxx>
@@ -888,7 +888,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
             "type is null", *this, 0);
     }
 
-    ::comphelper::SequenceAsVector< uno::Reference< rdf::XURI > > ret;
+    ::std::vector< uno::Reference< rdf::XURI > > ret;
     const ::std::vector< uno::Reference< rdf::XURI > > parts(
         getAllParts(*m_pImpl) );
     ::std::remove_copy_if(parts.begin(), parts.end(),
@@ -896,7 +896,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
         ::boost::bind(
             ::std::logical_not<bool>(),
             ::boost::bind(&isPartOfType, ::boost::ref(*m_pImpl), _1, i_xType) ));
-    return ret.getAsConstList();
+    return ::comphelper::containerToSequence(ret);
 }
 
 uno::Reference<rdf::XURI> SAL_CALL
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 022d96fb04cd..8730b67812c5 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -66,7 +66,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/docfile.hxx>
 #include <sax/tools/converter.hxx>
@@ -895,7 +895,7 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
 std::pair<css::uno::Sequence< OUString>, AttrVector> SAL_CALL
 propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
 {
-    ::comphelper::SequenceAsVector< OUString > values;
+    ::std::vector< OUString > values;
     AttrVector attrs;
 
     css::uno::Reference<css::beans::XPropertySetInfo> xSetInfo
@@ -1000,7 +1000,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
         attrs.push_back(as);
     }
 
-    return std::make_pair(values.getAsConstList(), attrs);
+    return std::make_pair(comphelper::containerToSequence(values), attrs);
 }
 
 // remove the given element from the DOM, and iff i_pAttrs != 0 insert new one
@@ -1721,7 +1721,7 @@ SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException,
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
-    ::comphelper::SequenceAsVector<css::beans::NamedValue> stats;
+    ::std::vector<css::beans::NamedValue> stats;
     for (size_t i = 0; s_stdStats[i] != 0; ++i) {
         const char * aName = s_stdStatAttrs[i];
         OUString text = getMetaAttr("meta:document-statistic", aName);
@@ -1740,7 +1740,7 @@ SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException,
         stats.push_back(stat);
     }
 
-    return stats.getAsConstList();
+    return ::comphelper::containerToSequence(stats);
 }
 
 void SAL_CALL
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 91e409e5f1ce..31be811246ca 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <sfx2/sfxuno.hxx>
 
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 25b3f8135d50..a7657eedeeaf 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include <comphelper/sequenceasvector.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weak.hxx>
 #include <svtools/toolboxcontroller.hxx>
@@ -79,7 +78,7 @@ public:
 
 private:
 
-    typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec;
+    typedef ::std::vector< css::beans::PropertyValue > SearchToolbarControllersVec;
     typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap;
     SearchToolbarControllersMap aSearchToolbarControllersMap;
     std::vector<OUString> m_aSearchStrings;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index fadb0801ab42..9f091e1d2bac 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -463,7 +463,6 @@
 #include <comphelper/scoped_disposing_ptr.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index dc763f872233..d778685749d0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/text/GraphicCrop.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 
 class Test : public SwModelTestBase
 {
@@ -1503,7 +1502,8 @@ DECLARE_OOXMLEXPORT_TEST(testPresetShape, "preset-shape.docx")
     uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY);
     comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
     comphelper::SequenceAsHashMap aPath(aCustomShapeGeometry["Path"]);
-    comphelper::SequenceAsVector<awt::Size> aSubViewSize(aPath["SubViewSize"]);
+    uno::Sequence<awt::Size>      aSubViewSize((aPath["SubViewSize"]).get<uno::Sequence<awt::Size> >() );
+
     // This was 0.
     CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aSubViewSize[0].Height);
 }
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 9c17966e9282..4635b3e777a7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -86,7 +86,7 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <svx/unoapi.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/color/bcolortools.hxx>
 
@@ -207,14 +207,14 @@ public:
 
 class BorderLines
 {
-    typedef ::comphelper::SequenceAsVector<
+    typedef ::std::vector<
         ::rtl::Reference<BorderLinePrimitive2D> > Lines_t;
     Lines_t m_Lines;
 public:
     void AddBorderLine(::rtl::Reference<BorderLinePrimitive2D> const& xLine, SwPaintProperties& properties);
     drawinglayer::primitive2d::Primitive2DSequence GetBorderLines_Clear()
     {
-        ::comphelper::SequenceAsVector<
+        ::std::vector<
             ::drawinglayer::primitive2d::Primitive2DReference> lines;
         for (Lines_t::const_iterator it = m_Lines.begin(); it != m_Lines.end();
                 ++it)
@@ -222,7 +222,7 @@ public:
             lines.push_back(it->get());
         }
         m_Lines.clear();
-        return lines.getAsConstList();
+        return comphelper::containerToSequence(lines);
     }
 };
 
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 2a0f65c1b15f..b185d9d9e837 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -82,7 +82,7 @@
 #include <vbahelper/vbaaccesshelper.hxx>
 #include <basic/basmgr.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::document;
@@ -1668,7 +1668,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void)
     if(!IsValid())
         throw uno::RuntimeException();
 
-    ::comphelper::SequenceAsVector< OUString > ret;
+    ::std::vector< OUString > ret;
     IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
     for (IDocumentMarkAccess::const_iterator_t ppMark =
             pMarkAccess->getBookmarksBegin();
@@ -1680,7 +1680,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void)
             ret.push_back((*ppMark)->GetName()); // only add real bookmarks
         }
     }
-    return ret.getAsConstList();
+    return comphelper::containerToSequence(ret);
 }
 
 sal_Bool SwXBookmarks::hasByName(const OUString& rName)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index b8bb32292dae..1a17f3d579b7 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -64,8 +64,8 @@
 #include <com/sun/star/text/PositionAndSpaceMode.hpp>
 #include <com/sun/star/text/LabelFollow.hpp>
 #include <numrule.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <paratr.hxx>
 
@@ -1360,7 +1360,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
 {
     bool bChapterNum = pHeadingStyleName != 0;
 
-    ::comphelper::SequenceAsVector<PropertyValue> aPropertyValues;
+    ::std::vector<PropertyValue> aPropertyValues;
     aPropertyValues.reserve(32);
     //fill all properties into the array
 
@@ -1530,7 +1530,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
                 makePropertyValue(aUString, UNO_NAME_HEADING_STYLE_NAME));
     }
 
-    return aPropertyValues.getAsConstList();
+    return ::comphelper::containerToSequence(aPropertyValues);
 }
 
 static PropertyValue const* lcl_FindProperty(
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index d8dfed2cd3cc..6141ea65527d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -71,7 +71,7 @@
 
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 //UUUU
 #include <svx/unobrushitemhelper.hxx>
@@ -767,7 +767,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
 uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    comphelper::SequenceAsVector< OUString > aRet;
+    std::vector< OUString > aRet;
     if(pBasePool)
     {
         SfxStyleSheetIteratorPtr pIt = pBasePool->CreateIterator(eFamily, SFXSTYLEBIT_ALL);
@@ -782,7 +782,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt
     else
         throw uno::RuntimeException();
 
-    return aRet.getAsConstList();
+    return comphelper::containerToSequence(aRet);
 }
 
 sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 8a17fd144b74..98cdff3d5877 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -30,7 +30,9 @@
 #include <docxattributeoutput.hxx>
 #include <docxexportfilter.hxx>
 #include <comphelper/seqstream.hxx>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
+
+
 #include <IDocumentDrawModelAccess.hxx>
 
 using namespace com::sun::star;
@@ -667,8 +669,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
                                                        XML_edited, "0",
                                                        FSEND);
                 drawing::PointSequenceSequence aSeqSeq = it->second.get< drawing::PointSequenceSequence >();
-                comphelper::SequenceAsVector<awt::Point> aPoints(aSeqSeq[0]);
-                for (comphelper::SequenceAsVector<awt::Point>::iterator i = aPoints.begin(); i != aPoints.end(); ++i)
+                std::vector<awt::Point> aPoints(comphelper::sequenceToContainer<std::vector<awt::Point> >(aSeqSeq[0]));
+                for (std::vector<awt::Point>::iterator i = aPoints.begin(); i != aPoints.end(); ++i)
                 {
                     awt::Point& rPoint = *i;
                     m_pImpl->m_pSerializer->singleElementNS(XML_wp, (i == aPoints.begin() ? XML_start : XML_lineTo),
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 00e8ddb43a16..81f64950192a 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -125,7 +125,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/stillreadwriteinteraction.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index b3b92562ce43..32631e07a142 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <tools/urlobj.hxx>
 
 #include <unotools/pathoptions.hxx>
@@ -440,7 +440,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
         Sequence< Any >         lValues = GetProperties( lAllAuthors );
         if( lValues.getLength() == c2 )
         {
-            comphelper::SequenceAsVector< SvtSecurityOptions::Certificate > v;
+            std::vector< SvtSecurityOptions::Certificate > v;
             SvtSecurityOptions::Certificate aCert( 3 );
             for( i1 = 0, i2 = 0; i1 < c1; ++i1 )
             {
@@ -459,7 +459,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
                     v.push_back( aCert );
                 }
             }
-            m_seqTrustedAuthors = v.getAsConstList();
+            m_seqTrustedAuthors = comphelper::containerToSequence(v);
         }
     }
 }
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index b53c744edccf..869482888bca 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -58,7 +58,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/makesequence.hxx>
 #include <comphelper/xmltools.hxx>
 
@@ -1252,12 +1252,12 @@ librdf_Repository::getGraphNames()
 throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
-    ::comphelper::SequenceAsVector< uno::Reference<rdf::XURI> > ret;
+    ::std::vector< uno::Reference<rdf::XURI> > ret;
     std::transform(m_NamedGraphs.begin(), m_NamedGraphs.end(),
         std::back_inserter(ret),
         boost::bind(&rdf::XNamedGraph::getName,
             boost::bind(&NamedGraphMap_t::value_type::second, _1)));
-    return ret.getAsConstList();
+    return comphelper::containerToSequence(ret);
 }
 
 uno::Reference< rdf::XNamedGraph > SAL_CALL
@@ -1667,7 +1667,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
                 "cannot create URI for XML ID", *this, uno::makeAny(iae));
     }
 
-    ::comphelper::SequenceAsVector< rdf::Statement > ret;
+    ::std::vector< rdf::Statement > ret;
     try
     {
         const uno::Reference<container::XEnumeration> xIter(
@@ -1693,7 +1693,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
 
     return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >(
-            ret.getAsConstList(), 0 != m_RDFaXHTMLContentSet.count(sXmlId));
+            comphelper::containerToSequence(ret), 0 != m_RDFaXHTMLContentSet.count(sXmlId));
 }
 
 extern "C"
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())
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 1255351a0b51..e5a3e2e4ba9f 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -492,7 +492,6 @@
 #include <comphelper/random.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 61b716925e74..5b801560e6e9 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -22,7 +22,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <com/sun/star/rdf/URI.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
@@ -337,7 +337,7 @@ void RDFaInserter::InsertRDFaEntry(
         return; // invalid
     }
 
-    ::comphelper::SequenceAsVector< uno::Reference< rdf::XURI > > predicates;
+    ::std::vector< uno::Reference< rdf::XURI > > predicates;
 
     predicates.reserve(i_rEntry.m_pRDFaAttributes->m_Properties.size());
 
@@ -374,7 +374,7 @@ void RDFaInserter::InsertRDFaEntry(
         // N.B.: this will call xMeta->ensureMetadataReference, which is why
         // this must be done _after_ importing the whole XML file,
         // to prevent collision between generated ids and ids in the file
-        m_xRepository->setStatementRDFa(xSubject, predicates.getAsConstList(),
+        m_xRepository->setStatementRDFa(xSubject, comphelper::containerToSequence(predicates),
             i_rEntry.m_xObject,
             i_rEntry.m_pRDFaAttributes->m_Content, xDatatype);
     }
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index f18dbb29afaf..29948d0b769c 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -34,7 +34,7 @@
 
 #include <sax/tools/converter.hxx>
 
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
 #include <unotools/docinfohelper.hxx>
 
 #include <string.h>
@@ -320,7 +320,7 @@ void SvXMLMetaExport::Export()
     uno::Reference< xml::sax::XSAXSerializable> xSAXable(mxDocProps,
         uno::UNO_QUERY);
     if (xSAXable.is()) {
-        ::comphelper::SequenceAsVector< beans::StringPair > namespaces;
+        ::std::vector< beans::StringPair > namespaces;
         const SvXMLNamespaceMap & rNsMap(mrExport.GetNamespaceMap());
         for (sal_uInt16 key = rNsMap.GetFirstKey();
              key != USHRT_MAX; key = rNsMap.GetNextKey(key)) {
@@ -336,7 +336,7 @@ void SvXMLMetaExport::Export()
             ns.Second = rNsMap.GetNameByKey(key);
             namespaces.push_back(ns);
         }
-        xSAXable->serialize(this, namespaces.getAsConstList());
+        xSAXable->serialize(this, comphelper::containerToSequence(namespaces));
     } else {
         // office:meta
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_OFFICE, XML_META,
author	Matthew Pottage <matthewpottage@invincitech.com>	2014-10-28 16:50:02 +0000
committer	Michael Stahl <mstahl@redhat.com>	2015-02-06 23:06:58 +0100
commit	4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch)
tree	d626505be68b47a1219d9838f9d5dc35c7271248
parent	90613f4e47e5e113e5fafb573d832bfcace314e5 (diff)