Get rid of DECLARE_STL_VECTOR

Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a

4 files changed, 18 insertions, 10 deletions

diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 6a4d4c8711e5..6a4643bc2df0 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -19,6 +19,11 @@
 #ifndef _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 #define _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 
+#include <sal/config.h>
+
+#include <map>
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/sdbc/XPooledConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
@@ -27,7 +32,6 @@
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <salhelper/timer.hxx>
 #include <rtl/ref.hxx>
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 0ca1cf4afa6e..a61c2f976aa3 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -20,6 +20,10 @@
 #ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 #define _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -63,8 +67,8 @@ namespace connectivity
     {
 
     public:
-        DECLARE_STL_VECTOR(ORowSetValueDecoratorRef,ORow);
-        DECLARE_STL_VECTOR(ORow, ORows);
+        typedef std::vector<ORowSetValueDecoratorRef> ORow;
+        typedef std::vector<ORow> ORows;
 
         enum MetaDataResultSetType
         {
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 20aec320242a..02f3a9ce4001 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -29,7 +29,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -38,6 +37,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <vector>
 
 #include <o3tl/compat_functional.hxx>
 
@@ -66,9 +66,9 @@ class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
     friend class OSDBCDriverManager;
 
-    DECLARE_STL_VECTOR( Reference< XDriver >, DriverArray );
+    typedef std::vector< Reference< XDriver > > DriverArray;
     DriverArray                 m_aDrivers;
-    ConstDriverArrayIterator    m_aPos;
+    DriverArray::const_iterator m_aPos;
     // order matters!
 
 protected:
@@ -371,7 +371,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
         const OUString* pDriverOrderEnd  =   pDriverOrder +  aDriverOrder.getLength();
 
         // the first driver for which there is no preference
-        DriverAccessArrayIterator aNoPrefDriversStart = m_aDriversBS.begin();
+        DriverAccessArray::iterator aNoPrefDriversStart = m_aDriversBS.begin();
             // at the moment this is the first of all drivers we know
 
         for ( ; ( pDriverOrder < pDriverOrderEnd ) && ( aNoPrefDriversStart != m_aDriversBS.end() ); ++pDriverOrder )
@@ -380,7 +380,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
             driver_order.sImplementationName = *pDriverOrder;
 
             // look for the impl name in the DriverAccess array
-            ::std::pair< DriverAccessArrayIterator, DriverAccessArrayIterator > aPos =
+            ::std::pair< DriverAccessArray::iterator, DriverAccessArray::iterator > aPos =
                 ::std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), driver_order, CompareDriverAccessByName() );
 
             if ( aPos.first != aPos.second )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 85bfec4720c4..c5cb4e855334 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <com/sun/star/sdbc/XDriverManager2.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -33,7 +34,6 @@
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
 #include <cppuhelper/implbase3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/logging.hxx>
 #include <osl/mutex.hxx>
 #include "connectivity/DriversConfig.hxx"
@@ -69,7 +69,7 @@ namespace drivermanager
         css::uno::Reference<css::uno::XComponentContext>  m_xContext;
         ::comphelper::EventLogger       m_aEventLogger;
 
-        DECLARE_STL_VECTOR(DriverAccess, DriverAccessArray);
+        typedef std::vector<DriverAccess> DriverAccessArray;
         DriverAccessArray               m_aDriversBS;
 
         // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface,