From 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 Mon Sep 17 00:00:00 2001
From: Matthew Pottage <matthewpottage@invincitech.com>
Date: Tue, 28 Oct 2014 16:50:02 +0000
Subject: 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
---
 package/source/manifest/ManifestImport.cxx | 3 ++-
 package/source/manifest/ManifestImport.hxx | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/source')

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;
-- 
cgit