3 files changed, 8 insertions, 4 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;
     };