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
---
 unotools/inc/pch/precompiled_utl.hxx       | 1 -
 unotools/source/config/securityoptions.cxx | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'unotools')

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