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 /dbaccess/source/inc | |
| parent | 4a8175ebeb58555e5d48df134cfaf128293888f1 (diff) | |
Get rid of DECLARE_STL_VECTOR
Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a
Diffstat (limited to 'dbaccess/source/inc')
| -rw-r--r-- | dbaccess/source/inc/apitools.hxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/inc/dsntypes.hxx | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index fd32e6a2b0fc..eb6db2aa42e7 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -20,17 +20,20 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX #define INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX +#include <sal/config.h> + +#include <vector> + #include <cppuhelper/component.hxx> #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <osl/diagnose.h> -#include <comphelper/stl_types.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> // various typedefs namespace { -DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray); +typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray; } // OSubComponent - a component which holds a hard ref to it's parent diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index a2106c22b681..706fa32c95ce 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX #define INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX -#include <comphelper/stl_types.hxx> +#include <sal/config.h> + +#include <vector> + #include "dbadllapi.hxx" #include <connectivity/DriversConfig.hxx> @@ -97,7 +100,7 @@ enum DATASOURCE_TYPE class OOO_DLLPUBLIC_DBA ODsnTypeCollection { protected: - DECLARE_STL_VECTOR(OUString, StringVector); + typedef std::vector<OUString> StringVector; StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource |