Get rid of DECLARE_STL_MAP

Change-Id: Ifbda934a89087fcc1c031978d3e5b5783722b328

30 files changed, 94 insertions, 61 deletions

diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 57ce183a2777..03eb49e15294 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -187,7 +187,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _
     {
         Reference< XDriver > xExistentProxy;
         // look if we already have a proxy for this driver
-        for (   ConstMapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin();
+        for (   MapDriver2DriverRef::const_iterator aLookup = m_aDriverProxies.begin();
                 aLookup != m_aDriverProxies.end();
                 ++aLookup
             )
@@ -474,10 +474,10 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr
             getNodeValue(getDriverNameNodeName(),evt.Source) >>= sThisDriverName;
             // 1nd relase the driver
             // look if we already have a proxy for this driver
-            MapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin();
+            MapDriver2DriverRef::iterator aLookup = m_aDriverProxies.begin();
             while(  aLookup != m_aDriverProxies.end())
             {
-                MapDriver2DriverRefIterator aFind = aLookup;
+                MapDriver2DriverRef::iterator aFind = aLookup;
                 Reference<XServiceInfo> xInfo(aLookup->first,UNO_QUERY);
                 ++aLookup;
                 if(xInfo.is() && xInfo->getImplementationName() == sThisDriverName)
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 41062127d21a..60fe2b4845ea 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -61,11 +61,11 @@ namespace connectivity
         typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver >  ODriverCompare;
         typedef std::map<OUString, OConnectionPool*> OConnectionPools;
 
-        DECLARE_STL_MAP(
+        typedef std::map<
                 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,
                 ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDriver >,
-                ODriverCompare,
-                MapDriver2DriverRef );
+                ODriverCompare>
+                MapDriver2DriverRef;
 
         MapDriver2DriverRef                                                                 m_aDriverProxies;
         ::osl::Mutex                                                                        m_aMutex;
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index e388676320b6..06b07cac2922 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -825,7 +825,7 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode,
         if (aTableRange.isEmpty())   // None found
         {
             // Look for the columns in the tables
-            for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter)
+            for (OSQLTables::const_iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter)
             {
                 if (aIter->second.is())
                 {
@@ -1697,13 +1697,13 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
     if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
     {   // SELECT * ...
         OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
-        for(ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end();++aIter)
+        for(OSQLTables::const_iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end();++aIter)
             appendColumns(_rColumns,aIter->first,aIter->second);
     }
     else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() )
     {   // SELECT <table>.*
         OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
-        ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange);
+        OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange);
 
         if(aFind != m_pImpl->m_pTables->end())
             appendColumns(_rColumns,rTableRange,aFind->second);
@@ -1715,7 +1715,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
         {
             Reference< XPropertySet> xNewColumn;
 
-            for ( OSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter )
+            for ( OSQLTables::iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter )
             {
                 if ( !aIter->second.is() )
                     continue;
@@ -1786,7 +1786,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
     }
     else    // ColumnName and TableName exist
     {
-        ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange);
+        OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange);
 
         sal_Bool bError = sal_False;
         if (aFind != m_pImpl->m_pTables->end() && aFind->second.is())
@@ -2095,7 +2095,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _r
     Reference< XPropertySet > xColumn;
     if ( !rTableRange.isEmpty() )
     {
-        ConstOSQLTablesIterator aFind = _rTables.find(rTableRange);
+        OSQLTables::const_iterator aFind = _rTables.find(rTableRange);
 
         if ( aFind != _rTables.end()
             && aFind->second.is()
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 3ac25d013503..d356093c0c40 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -776,7 +776,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
     SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rURL.Complete);
     if (aIter != m_aSupportedFeatures.end())
     {   // clear the cache for that feature
-        StateCacheIterator aCachePos = m_aStateCache.find( aIter->second.nFeatureId );
+        StateCache::iterator aCachePos = m_aStateCache.find( aIter->second.nFeatureId );
         if ( aCachePos != m_aStateCache.end() )
             m_aStateCache.erase( aCachePos );
     }
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index be221ab362c2..6919c735f5c1 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -563,7 +563,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
 {
     if (_rxSource.is())
     {
-        for (   ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
+        for (   MapInt2String::const_iterator aDirect = m_aDirectPropTranslator.begin();
                 aDirect != m_aDirectPropTranslator.end();
                 ++aDirect
             )
@@ -614,8 +614,8 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
         if ( !aInfos.empty() )
         {
             PropertyValue aSearchFor;
-            ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end();
-            for (   ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin();
+            MapInt2String::const_iterator aEnd = m_aIndirectPropTranslator.end();
+            for (   MapInt2String::const_iterator aIndirect = m_aIndirectPropTranslator.begin();
                     aIndirect != aEnd;
                     ++aIndirect)
             {
@@ -656,7 +656,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
 
     const OUString sUrlProp("URL");
     // transfer the direct properties
-    for (   ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
+    for (   MapInt2String::const_iterator aDirect = m_aDirectPropTranslator.begin();
             aDirect != m_aDirectPropTranslator.end();
             ++aDirect
         )
@@ -713,7 +713,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
 
     // collect the translated property values for the relevant items
     PropertyValueSet aRelevantSettings;
-    ConstMapInt2StringIterator aTranslation;
+    MapInt2String::const_iterator aTranslation;
     ::std::vector< sal_Int32>::iterator aDetailsEnd = aDetailIds.end();
     for (::std::vector< sal_Int32>::iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter)
     {
@@ -778,8 +778,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
         // now check the to-be-preserved props
         ::std::vector< sal_Int32 > aRemoveIndexes;
         sal_Int32 nPositionCorrector = 0;
-        ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end();
-        for (   ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin();
+        MapInt2String::const_iterator aPreservedEnd = aPreservedSettings.end();
+        for (   MapInt2String::const_iterator aPreserved = aPreservedSettings.begin();
                 aPreserved != aPreservedEnd;
                 ++aPreserved
             )
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 59bc3d2bb5a0..c303443f1b22 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 
+#include <map>
 #include <set>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -30,7 +31,6 @@
 #include <com/sun/star/sdb/XDatabaseContext.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
-#include <comphelper/stl_types.hxx>
 #include "dsntypes.hxx"
 #include <svl/itemset.hxx>
 #include <com/sun/star/frame/XModel.hpp>
@@ -52,7 +52,7 @@ namespace dbaui
     class ODbDataSourceAdministrationHelper
     {
     public:
-        DECLARE_STL_MAP(sal_Int32, OUString, ::std::less< sal_Int32 >, MapInt2String);
+        typedef std::map<sal_Int32, OUString> MapInt2String;
 
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 609cc9ae81ac..b8bdd5151fc0 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -193,7 +193,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     // are set. Select another data source of the same type, where the indirect props are not set (yet). Then,
     // the indirect property values of the first ds are shown in the second ds ...)
     const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties();
-    for (   ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
+    for (   ODbDataSourceAdministrationHelper::MapInt2String::const_iterator aIndirect = rMap.begin();
             aIndirect != rMap.end();
             ++aIndirect
         )
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index b02ae2793718..32b00df23b6f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -394,7 +394,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas
     // are set. Select another data source of the same type, where the indirect props are not set (yet). Then,
     // the indirect property values of the first ds are shown in the second ds ...)
     const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties();
-    for (   ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
+    for (   ODbDataSourceAdministrationHelper::MapInt2String::const_iterator aIndirect = rMap.begin();
             aIndirect != rMap.end();
             ++aIndirect
         )
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 5b1f4ab6756b..aef6c7dc29d4 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/Date.hpp>
+#include <map>
 #include <vector>
 #include <comphelper/stl_types.hxx>
 #include "TypeInfo.hxx"
@@ -54,7 +55,7 @@ namespace dbaui
     class ODatabaseExport
     {
     public:
-        DECLARE_STL_MAP(OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns);
+        typedef std::map<OUString, OFieldDescription*, ::comphelper::UStringMixLess> TColumns;
         typedef ::std::vector<TColumns::const_iterator>             TColumnVector;
         typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> >   TPositions;
 
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 8fd29912eccd..ec5a91855be7 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <vcl/lstbox.hxx>
 #include <functional>
+#include <map>
 
 namespace dbaui
 {
@@ -220,7 +221,7 @@ namespace dbaui
         friend class        OWizNameMatching;
 
     public:
-        DECLARE_STL_MAP(OUString,OUString,::comphelper::UStringMixLess,TNameMapping);
+        typedef std::map<OUString, OUString, ::comphelper::UStringMixLess> TNameMapping;
 
         enum Wizard_Button_Style
         {
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 0eaaca97ffd5..593e055e73be 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 #include "sbamultiplex.hxx"
 #include <svx/dataaccessdescriptor.hxx>
 #include <map>
@@ -60,7 +59,7 @@ namespace dbaui
                 :public FmXGridControl
                 ,public ::com::sun::star::frame::XDispatch
     {
-        DECLARE_STL_MAP(::com::sun::star::util::URL, SbaXStatusMultiplexer*, SbaURLCompare,StatusMultiplexerArray);
+        typedef std::map<css::util::URL, SbaXStatusMultiplexer*, SbaURLCompare> StatusMultiplexerArray;
         StatusMultiplexerArray      m_aStatusMultiplexer;
 
     public:
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index aaf436291e6e..27d8303ac35e 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "dbu_reghelper.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "dbu_rel.hrc"
@@ -272,7 +276,7 @@ namespace
 {
     class RelationLoader : public ::osl::Thread
     {
-        DECLARE_STL_MAP(OUString,::boost::shared_ptr<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper);
+        typedef std::map<OUString, ::boost::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper;
         TTableDataHelper                    m_aTableData;
         TTableConnectionData                m_vTableConnectionData;
         const Sequence< OUString>    m_aTableList;
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
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 7dc478d2db22..8b57b1a9bcc2 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -19,6 +19,10 @@
 #ifndef REPORTDESIGN_API_REPORTENGINEJFREE_HXX
 #define REPORTDESIGN_API_REPORTENGINEJFREE_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/report/XReportEngine.hpp>
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 36329fe71a33..1ab4f298772f 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -16,6 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include <sal/config.h>
+
+#include <map>
+
 #include "GeometryHandler.hxx"
 
 #include <comphelper/types.hxx>
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 905958234ee6..135fcd7b677e 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "AsynchronousCall.hxx"
 #include "Context.hxx"
 #include "FocusManager.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ef267c0d25b9..957d7b478028 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -53,10 +53,10 @@
 #include "fmservs.hxx"
 #include "sdbdatacolumn.hxx"
 
-#include <comphelper/stl_types.hxx>
 #include <comphelper/property.hxx>
 
 #include <algorithm>
+#include <map>
 
 using namespace ::svxform;
 using namespace ::svt;
@@ -117,7 +117,7 @@ private:
 };
 
 class GridFieldValueListener;
-DECLARE_STL_MAP(sal_uInt16, GridFieldValueListener*, ::std::less<sal_uInt16>, ColumnFieldValueListeners);
+typedef std::map<sal_uInt16, GridFieldValueListener*> ColumnFieldValueListeners;
 
 DBG_NAME(GridFieldValueListener)
 class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
@@ -3464,7 +3464,7 @@ void DbGridControl::BeginCursorAction()
     if (m_pFieldListeners)
     {
         ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners;
-        ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+        ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
         while (aIter != pListeners->end())
         {
             GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3483,7 +3483,7 @@ void DbGridControl::EndCursorAction()
     if (m_pFieldListeners)
     {
         ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners;
-        ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+        ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
         while (aIter != pListeners->end())
         {
             GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3590,7 +3590,7 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId)
         return;
     }
 
-    ColumnFieldValueListenersIterator aPos = pListeners->find(_nId);
+    ColumnFieldValueListeners::iterator aPos = pListeners->find(_nId);
     if (aPos == pListeners->end())
     {
         OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !");
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 5133709d5d99..c589c23ff41b 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "svx/svdmark.hxx"
 #include "fmdocumentclassification.hxx"
 
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index bf34bec5d964..f93a4cdf4b14 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/container.hxx>
 
 #include <algorithm>
+#include <map>
 #include <set>
 #include <vector>
 
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index 8a6a99e8d365..87f490f237f9 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -123,7 +123,7 @@ namespace xmloff
         // loop through all elements
         sal_Int32 nCount = _rxContainer->getCount();
         Reference< XPropertySet > xCurrent;
-        ConstMapPropertySet2ScriptSequenceIterator aRegisteredEventsPos;
+        MapPropertySet2ScriptSequence::const_iterator aRegisteredEventsPos;
         for (sal_Int32 i=0; i<nCount; ++i)
         {
             ::cppu::extractInterface(xCurrent, _rxContainer->getByIndex(i));
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index a7a56cb8a112..8f38159f483e 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "callbacks.hxx"
 #include "ifacecompare.hxx"
@@ -47,11 +51,11 @@ namespace xmloff
     class ODefaultEventAttacherManager : public IEventAttacherManager
     {
     protected:
-        DECLARE_STL_MAP(
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >,              // map from
-            ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >,     // map to
-            OPropertySetCompare,                                                                    // compare method
-            MapPropertySet2ScriptSequence);                                                         // class name
+        typedef std::map<
+            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >,
+            ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >,
+            OPropertySetCompare>
+            MapPropertySet2ScriptSequence;
         // usually an event attacher manager will need to collect all script events registered, 'cause
         // the _real_ XEventAttacherManager handles it's events by index, but out indicies are not fixed
         // until _all_ controls have been inserted.
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 3738aa5beb23..3ff18dbf398f 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -391,7 +391,7 @@ namespace xmloff
     {
         OUString sNumberStyle;
 
-        ConstMapPropertySet2IntIterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl);
+        MapPropertySet2Int::const_iterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl);
         if (m_aControlNumberFormats.end() != aControlFormatPos)
         {
             OSL_ENSURE(m_pControlNumberStyles, "OFormLayerXMLExport_Impl::getControlNumberStyle: have a control which has a format style, but no style exporter!");
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 2089d3ba4b91..3a6423170931 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 
+#include <map>
 #include <set>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -111,7 +112,7 @@ namespace xmloff
         // TODO: To avoid this construct above, and to have a cleaner implementation, an class encapsulating the
         // export of a single page should be introduced.
 
-        DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, sal_Int32, OPropertySetCompare, MapPropertySet2Int);
+        typedef std::map<css::uno::Reference<css::beans::XPropertySet>, sal_Int32, OPropertySetCompare> MapPropertySet2Int;
         MapPropertySet2Int  m_aControlNumberFormats;
             // maps controls to format keys, which are relative to our own formats supplier
 
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 26c22c34187b..4779b4e18ce6 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -392,7 +392,7 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa
         return;
 
     // add a new entry to our page map
-    ::std::pair< MapDrawPage2MapIterator, bool > aPagePosition;
+    ::std::pair< MapDrawPage2Map::iterator, bool > aPagePosition;
     aPagePosition =
         m_aControlIds.insert(MapDrawPage2Map::value_type(_rxDrawPage, MapString2PropertySet()));
     OSL_ENSURE(aPagePosition.second, "OFormLayerXMLImport_Impl::startPage: already imported this page!");
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 207c99671bea..86beb9e282a2 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -62,10 +62,10 @@ namespace xmloff
 
     protected:
         typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > MapString2PropertySet;
-        DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map);
+        typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map;
 
         MapDrawPage2Map         m_aControlIds;          // ids of the controls on all known page
-        MapDrawPage2MapIterator m_aCurrentPageIds;      // ifs of the controls on the current page
+        MapDrawPage2Map::iterator m_aCurrentPageIds;      // ifs of the controls on the current page
 
         typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString >
                                 ModelStringPair;