Get rid of DECLARE_STL_STDKEY_MAP

Change-Id: I099f94922acba0bf9cde22fbbb3eefc230776868

8 files changed, 19 insertions, 18 deletions

diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 11d0d8f203ab..8a52eb039c62 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -19,8 +19,11 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "RowSetRow.hxx"
-#include <comphelper/stl_types.hxx>
 
 namespace dbaccess
 {
@@ -32,7 +35,7 @@ namespace dbaccess
         ORowSetBase*                pRowSet;
     } ORowSetCacheIterator_Helper;
 
-    DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap);
+    typedef std::map<sal_Int32, ORowSetCacheIterator_Helper> ORowSetCacheMap;
 
     class ORowSetCache;
     class ORowSetCacheIterator
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index a98fd401cdcf..96b50f210675 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -334,7 +334,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl,
     aEvt.IsEnabled = !pGrid->IsReadOnlyDB();
     aEvt.FeatureURL = _rUrl;
 
-    ConstMapDispatchToBoolIterator aURLStatePos = m_aDispatchStates.find( classifyDispatchURL( _rUrl ) );
+    MapDispatchToBool::const_iterator aURLStatePos = m_aDispatchStates.find( classifyDispatchURL( _rUrl ) );
     if ( m_aDispatchStates.end() != aURLStatePos )
         aEvt.State <<= aURLStatePos->second;
     else
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 2d482a3e13f5..0eaaca97ffd5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -31,6 +31,7 @@
 #include <comphelper/stl_types.hxx>
 #include "sbamultiplex.hxx"
 #include <svx/dataaccessdescriptor.hxx>
+#include <map>
 #include <queue>
 
 class SvNumberFormatter;
@@ -163,7 +164,7 @@ namespace dbaui
         };
         DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL );
 
-        DECLARE_STL_STDKEY_MAP( DispatchType, sal_Bool, MapDispatchToBool );
+        typedef std::map<DispatchType, sal_Bool> MapDispatchToBool;
         MapDispatchToBool   m_aDispatchStates;
     };
 
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index 4ac0eb28e810..407116975b41 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -22,11 +22,10 @@
 
 #include <sal/config.h>
 
+#include <map>
 #include <set>
 #include <vector>
 
-#include <comphelper/stl_types.hxx>
-
 //.........................................................................
 namespace dbp
 {
@@ -34,7 +33,7 @@ namespace dbp
 
     typedef std::vector<OUString> StringArray;
     typedef std::set<OUString> StringBag;
-    DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
+    typedef std::map<sal_uInt32, OUString> MapInt2String;
 
 //.........................................................................
 }   // namespace dbp
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 3795ffb82f27..6ab7f45ba216 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -242,9 +242,6 @@ OutputIter intersperse(
     typedef std::map< keytype, valuetype, comparefct >  classname;  \
     DECLARE_STL_ITERATORS(classname)                                \
 
-#define DECLARE_STL_STDKEY_MAP(keytype, valuetype, classname)               \
-    DECLARE_STL_MAP(keytype, valuetype, std::less< keytype >, classname)    \
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index a9688e45073f..096ddcf8ebf1 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -43,7 +43,7 @@ namespace rptui
     using namespace ::com::sun::star;
 
 typedef std::map<OUString, bool> AllProperties;
-DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache);
+typedef std::map<uno::Reference< beans::XPropertySet >, AllProperties> PropertySetInfoCache;
 
 class OXReportControllerObserverImpl
 {
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 04e892063d79..49c61762bd2b 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
 
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
@@ -25,7 +28,6 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/style.hxx>
@@ -86,11 +88,11 @@ extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 ///////////////////////////////////////////////////////////////////////
 
-DECLARE_STL_STDKEY_MAP(sal_uIntPtr, SfxExtItemPropertySetInfo*, SdExtPropertySetInfoCache);
+typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache;
 static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
 static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache;
 
-DECLARE_STL_STDKEY_MAP(sal_uInt32, uno::Sequence< uno::Type >*, SdTypesCache);
+typedef std::map<sal_uInt32, uno::Sequence< uno::Type >*> SdTypesCache;
 static SdTypesCache gImplTypesCache;
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 3d7a94441fc2..e0cbe0a1cb7b 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -55,7 +55,6 @@
 #include <osl/mutex.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
@@ -167,7 +166,7 @@ sal_Bool operator < (const Reference< XPropertySet >& lhs,
     return lhs.get() < rhs.get();
 }
 
-DECLARE_STL_STDKEY_MAP(Reference< XPropertySet >, PropertySetInfo, PropertySetInfoCache);
+typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache;
 
 //------------------------------------------------------------------------------
 
@@ -530,7 +529,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
         if (xSourceSet.is())
         {
             PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
-            PropertySetInfoCacheIterator aSetPos = pCache->find(xSourceSet);
+            PropertySetInfoCache::iterator aSetPos = pCache->find(xSourceSet);
             if (aSetPos != pCache->end())
                 pCache->erase(aSetPos);
         }
@@ -591,7 +590,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
         PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
 
         // let's see if we know something about the set
-        PropertySetInfoCacheIterator aSetPos = pCache->find(xSet);
+        PropertySetInfoCache::iterator aSetPos = pCache->find(xSet);
         if (aSetPos == pCache->end())
         {
             PropertySetInfo aNewEntry;