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

4 files changed, 16 insertions, 13 deletions

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