diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 23:42:23 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:23 +0100 |
commit | 07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1 (patch) | |
tree | ac80d5449c42f832c14eb3fb3030208ae752b282 /connectivity/source/manager | |
parent | 4a8175ebeb58555e5d48df134cfaf128293888f1 (diff) |
Get rid of DECLARE_STL_VECTOR
Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a
Diffstat (limited to 'connectivity/source/manager')
-rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/manager/mdrivermanager.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
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, |