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

3 files changed, 6 insertions, 7 deletions

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,