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

8 files changed, 12 insertions, 16 deletions

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>