Get rid of DECLARE_STL_USTRINGACCESS_MAP

Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c

3 files changed, 15 insertions, 5 deletions

diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index c976de9f6602..b2f2c7631e57 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
@@ -19,7 +19,10 @@
 #ifndef INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
 #define INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -37,7 +40,7 @@ namespace connectivity
         OUString sDriverFactory;
         OUString sDriverTypeDisplayName;
     } TInstalledDriver;
-    DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);
+    typedef std::map<OUString, TInstalledDriver> TInstalledDrivers;
 
     class DriversConfigImpl
     {
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 9a1a1abc9c07..3298bf9b0f94 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_CONNECTIVITY_PCOLUMN_HXX
 #define INCLUDED_CONNECTIVITY_PCOLUMN_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
@@ -95,7 +99,7 @@ namespace connectivity
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns
                 );
 
-            DECLARE_STL_USTRINGACCESS_MAP(int,StringMap);
+            typedef std::map<OUString, int> StringMap;
             /** creates a single OParseColumn, as described by a result set meta data instance.
                 The column names are unique.
             */
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index c87cae1fe94f..421419773483 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -20,11 +20,14 @@
 #ifndef INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
 #define INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VTable.hxx>
 #include <connectivity/sdbcx/VKey.hxx>
 #include <connectivity/StdTypeDefs.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/sdb/tools/XTableRename.hpp>
 #include <com/sun/star/sdb/tools/XTableAlteration.hpp>
 #include <com/sun/star/sdb/tools/XKeyAlteration.hpp>
@@ -72,7 +75,7 @@ namespace connectivity
 
     OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
 
-    DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap);
+    typedef std::map<OUString, sdbcx::TKeyProperties> TKeyMap;
 
     struct OTableHelperImpl;