Get rid of DECLARE_STL_MAP

Change-Id: Ifbda934a89087fcc1c031978d3e5b5783722b328

6 files changed, 21 insertions, 16 deletions

diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 251236f57070..fb16be95d66b 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
 #define INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index f97dc43051d8..8bcb914bcc29 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
 #define INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <comphelper/proxyaggregation.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 6ab7f45ba216..08d42429d34a 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -21,8 +21,6 @@
 
 #include <sal/config.h>
 
-#include <map>
-
 #include <stack>
 
 #include <math.h>
@@ -238,10 +236,6 @@ OutputIter intersperse(
     typedef classname::iterator         classname##Iterator;        \
     typedef classname::const_iterator   Const##classname##Iterator  \
 
-#define DECLARE_STL_MAP(keytype, valuetype, comparefct, classname)  \
-    typedef std::map< keytype, valuetype, comparefct >  classname;  \
-    DECLARE_STL_ITERATORS(classname)                                \
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index fb19abf5e25f..0fca51e180fd 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -19,8 +19,11 @@
 #ifndef INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
 #define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
 
+#include <sal/config.h>
 #include <config_features.h>
 
+#include <map>
+
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -57,7 +60,7 @@ namespace connectivity
     typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>    OSQLTable;
 
-    DECLARE_STL_MAP(OUString,OSQLTable,comphelper::UStringMixLess,  OSQLTables);
+    typedef std::map<OUString,OSQLTable,comphelper::UStringMixLess> OSQLTables;
 
     // -------------------------------------------------------------------------
     // class ORefVector allows reference counting on a std::vector
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 3e86a2a1fd85..e5af4575a56c 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <deque>
+#include <map>
 #include <vector>
 
 #include <dbaccess/AsyncronousLink.hxx>
@@ -51,7 +53,6 @@
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/sharedmutex.hxx>
 #include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/stl_types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/compbase11.hxx>
 #include <cppuhelper/interfacecontainer.h>
@@ -229,7 +230,7 @@ namespace dbaui
             DispatchTarget(const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >  xRef) : aURL(rURL), xListener(xRef) { }
         };
 
-        DECLARE_STL_MAP( sal_uInt16, FeatureState, ::std::less< sal_uInt16 >, StateCache );
+        typedef std::map<sal_uInt16, FeatureState> StateCache;
         typedef std::vector<DispatchTarget> Dispatch;
 
         FeatureListeners        m_aFeaturesToInvalidate;
diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
index e0f8fd3af8fd..80698a6031e2 100644
--- a/include/unotools/idhelper.hxx
+++ b/include/unotools/idhelper.hxx
@@ -20,10 +20,13 @@
 #ifndef INCLUDED_UNOTOOLS_IDHELPER_HXX
 #define INCLUDED_UNOTOOLS_IDHELPER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 
@@ -68,12 +71,8 @@ public:
     }
 };
 
-// declare the map
-DECLARE_STL_MAP (   TypeSequence,
-                    ::cppu::OImplementationId,
-                    TypeSequenceLess,
-                    MapType2Id
-                );
+typedef std::map<TypeSequence, ::cppu::OImplementationId, TypeSequenceLess>
+MapType2Id;
 
 //.........................................................................
 }   // namespace utl