[Libreoffice-commits] core.git: 2 commits - basctl/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source extensions/source filter/source forms/source include/comphelper include/connectivity include/dbaccess include/svx reportdesign/inc reportdesign/source sc/source svtools/source svx/source sw/source unotools/source xmloff/source

Stephan Bergmann sbergman at redhat.com
Thu Dec 5 23:04:56 PST 2013


 basctl/source/inc/propbrw.hxx                                |    7 +-
 chart2/source/controller/main/ShapeToolbarController.hxx     |    7 +-
 chart2/source/model/filter/XMLFilter.cxx                     |    1 
 comphelper/source/container/NamedPropertyValuesContainer.cxx |    4 -
 comphelper/source/container/namecontainer.cxx                |    6 +-
 comphelper/source/property/genericpropertyset.cxx            |    6 +-
 connectivity/source/cpool/ZConnectionPool.hxx                |    6 +-
 connectivity/source/cpool/ZPoolCollection.hxx                |    6 +-
 connectivity/source/drivers/hsqldb/accesslog.cxx             |    6 +-
 connectivity/source/inc/FDatabaseMetaDataResultSet.hxx       |    8 ++
 connectivity/source/inc/hsqldb/HStorageMap.hxx               |    9 ++-
 connectivity/source/inc/mysql/YDriver.hxx                    |    7 +-
 connectivity/source/manager/mdrivermanager.cxx               |   18 +++---
 connectivity/source/manager/mdrivermanager.hxx               |   12 ++--
 cui/source/options/connpoolsettings.hxx                      |   11 ++--
 dbaccess/source/core/api/OptimisticSet.cxx                   |    3 -
 dbaccess/source/core/dataaccess/bookmarkcontainer.cxx        |    6 +-
 dbaccess/source/core/dataaccess/bookmarkcontainer.hxx        |   10 ++-
 dbaccess/source/core/dataaccess/connection.cxx               |    8 +-
 dbaccess/source/core/dataaccess/connection.hxx               |    7 +-
 dbaccess/source/core/dataaccess/databasecontext.cxx          |    4 -
 dbaccess/source/core/dataaccess/databasecontext.hxx          |    9 ++-
 dbaccess/source/core/dataaccess/databasedocument.hxx         |    6 +-
 dbaccess/source/core/inc/definitioncontainer.hxx             |   10 ++-
 dbaccess/source/filter/xml/xmlfilter.hxx                     |    4 -
 dbaccess/source/inc/apitools.hxx                             |    7 +-
 dbaccess/source/inc/dsntypes.hxx                             |    7 +-
 dbaccess/source/ui/browser/genericcontroller.cxx             |    6 +-
 dbaccess/source/ui/dlg/indexdialog.cxx                       |   10 +--
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx                |   18 +++---
 dbaccess/source/ui/dlg/paramdialog.cxx                       |    2 
 dbaccess/source/ui/inc/JoinTableView.hxx                     |    5 +
 dbaccess/source/ui/inc/TableGrantCtrl.hxx                    |    7 +-
 dbaccess/source/ui/inc/commontypes.hxx                       |    6 +-
 dbaccess/source/ui/inc/indexdialog.hxx                       |    2 
 dbaccess/source/ui/inc/indexes.hxx                           |    8 +-
 dbaccess/source/ui/inc/indexfieldscontrol.hxx                |    6 +-
 dbaccess/source/ui/inc/toolboxcontroller.hxx                 |    5 +
 dbaccess/source/ui/misc/indexcollection.cxx                  |    2 
 dbaccess/source/ui/querydesign/JoinTableView.cxx             |   30 +++++------
 dbaccess/source/ui/querydesign/QueryTableView.cxx            |    2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx        |    4 -
 extensions/source/abpilot/abptypes.hxx                       |    4 -
 extensions/source/abpilot/fieldmappingimpl.cxx               |    4 -
 extensions/source/dbpilots/dbptypes.hxx                      |    3 -
 extensions/source/dbpilots/groupboxwiz.cxx                   |    4 -
 extensions/source/dbpilots/wizardcontext.hxx                 |    7 +-
 filter/source/xsltdialog/typedetectionimport.hxx             |    4 -
 forms/source/component/DatabaseForm.cxx                      |    4 -
 forms/source/component/DatabaseForm.hxx                      |    7 +-
 forms/source/component/EventThread.hxx                       |   11 ++--
 forms/source/component/GroupManager.cxx                      |    2 
 forms/source/component/GroupManager.hxx                      |   11 ++--
 forms/source/inc/property.hxx                                |    7 +-
 forms/source/misc/property.cxx                               |    2 
 include/comphelper/propertysetinfo.hxx                       |    7 +-
 include/comphelper/stl_types.hxx                             |    9 ---
 include/connectivity/DriversConfig.hxx                       |    7 +-
 include/connectivity/PColumn.hxx                             |    6 +-
 include/connectivity/TTableHelper.hxx                        |    7 +-
 include/dbaccess/genericcontroller.hxx                       |    6 +-
 include/svx/fmsrcimp.hxx                                     |   24 ++++----
 reportdesign/inc/RptDef.hxx                                  |    7 +-
 reportdesign/source/filter/xml/xmlfilter.hxx                 |    6 +-
 reportdesign/source/ui/inc/FunctionHelper.hxx                |    7 +-
 reportdesign/source/ui/inc/toolboxcontroller.hxx             |    7 +-
 reportdesign/source/ui/report/ReportControllerObserver.cxx   |    5 +
 sc/source/ui/unoobj/shapeuno.cxx                             |    6 +-
 svtools/source/config/extcolorcfg.cxx                        |   12 ++--
 svtools/source/config/helpopt.cxx                            |    6 +-
 svtools/source/dialogs/addresstemplate.cxx                   |   10 +--
 svx/source/form/fmsrcimp.cxx                                 |   22 ++++----
 svx/source/form/fmundo.cxx                                   |    7 +-
 svx/source/form/formcontroller.cxx                           |    4 -
 svx/source/inc/fmshimp.hxx                                   |    3 -
 svx/source/inc/formcontroller.hxx                            |    7 +-
 sw/source/core/unocore/unodraw.cxx                           |    6 +-
 unotools/source/config/configvaluecontainer.cxx              |    6 +-
 unotools/source/misc/eventlisteneradapter.cxx                |    5 +
 xmloff/source/core/xmlexp.cxx                                |    5 +
 xmloff/source/draw/sdxmlimp_impl.hxx                         |    6 +-
 xmloff/source/forms/attriblistmerge.cxx                      |    6 +-
 xmloff/source/forms/attriblistmerge.hxx                      |    7 +-
 xmloff/source/forms/elementimport.cxx                        |    2 
 xmloff/source/forms/elementimport.hxx                        |    8 +-
 xmloff/source/forms/eventexport.cxx                          |    6 +-
 xmloff/source/forms/eventexport.hxx                          |    7 +-
 xmloff/source/forms/formattributes.cxx                       |    2 
 xmloff/source/forms/formattributes.hxx                       |    7 +-
 xmloff/source/forms/layerimport.cxx                          |    2 
 xmloff/source/forms/layerimport.hxx                          |    6 +-
 91 files changed, 385 insertions(+), 249 deletions(-)

New commits:
commit 07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 5 23:42:23 2013 +0100

    Get rid of DECLARE_STL_VECTOR
    
    Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a

diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index e5df9ba..ef4358b 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -20,9 +20,12 @@
 #ifndef BASCTL_PROPBRW_HXX
 #define BASCTL_PROPBRW_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
-#include <comphelper/stl_types.hxx>
 #include <svl/lstner.hxx>
 #include <svl/brdcst.hxx>
 #include <svx/svdmark.hxx>
@@ -56,7 +59,7 @@ protected:
     virtual void Resize();
     virtual sal_Bool Close();
 
-    DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
+    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
         CreateMultiSelectionSequence( const SdrMarkList& _rMarkList );
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 6a4d4c8..6a4643b 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -19,6 +19,11 @@
 #ifndef _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 #define _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 
+#include <sal/config.h>
+
+#include <map>
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/sdbc/XPooledConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
@@ -27,7 +32,6 @@
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <salhelper/timer.hxx>
 #include <rtl/ref.hxx>
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 0ca1cf4..a61c2f9 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -20,6 +20,10 @@
 #ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 #define _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -63,8 +67,8 @@ namespace connectivity
     {
 
     public:
-        DECLARE_STL_VECTOR(ORowSetValueDecoratorRef,ORow);
-        DECLARE_STL_VECTOR(ORow, ORows);
+        typedef std::vector<ORowSetValueDecoratorRef> ORow;
+        typedef std::vector<ORow> ORows;
 
         enum MetaDataResultSetType
         {
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 20aec32..02f3a9c 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -29,7 +29,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -38,6 +37,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <vector>
 
 #include <o3tl/compat_functional.hxx>
 
@@ -66,9 +66,9 @@ class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
     friend class OSDBCDriverManager;
 
-    DECLARE_STL_VECTOR( Reference< XDriver >, DriverArray );
+    typedef std::vector< Reference< XDriver > > DriverArray;
     DriverArray                 m_aDrivers;
-    ConstDriverArrayIterator    m_aPos;
+    DriverArray::const_iterator m_aPos;
     // order matters!
 
 protected:
@@ -371,7 +371,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
         const OUString* pDriverOrderEnd  =   pDriverOrder +  aDriverOrder.getLength();
 
         // the first driver for which there is no preference
-        DriverAccessArrayIterator aNoPrefDriversStart = m_aDriversBS.begin();
+        DriverAccessArray::iterator aNoPrefDriversStart = m_aDriversBS.begin();
             // at the moment this is the first of all drivers we know
 
         for ( ; ( pDriverOrder < pDriverOrderEnd ) && ( aNoPrefDriversStart != m_aDriversBS.end() ); ++pDriverOrder )
@@ -380,7 +380,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
             driver_order.sImplementationName = *pDriverOrder;
 
             // look for the impl name in the DriverAccess array
-            ::std::pair< DriverAccessArrayIterator, DriverAccessArrayIterator > aPos =
+            ::std::pair< DriverAccessArray::iterator, DriverAccessArray::iterator > aPos =
                 ::std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), driver_order, CompareDriverAccessByName() );
 
             if ( aPos.first != aPos.second )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 85bfec4..c5cb4e8 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <com/sun/star/sdbc/XDriverManager2.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -33,7 +34,6 @@
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
 #include <cppuhelper/implbase3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/logging.hxx>
 #include <osl/mutex.hxx>
 #include "connectivity/DriversConfig.hxx"
@@ -69,7 +69,7 @@ namespace drivermanager
         css::uno::Reference<css::uno::XComponentContext>  m_xContext;
         ::comphelper::EventLogger       m_aEventLogger;
 
-        DECLARE_STL_VECTOR(DriverAccess, DriverAccessArray);
+        typedef std::vector<DriverAccess> DriverAccessArray;
         DriverAccessArray               m_aDriversBS;
 
         // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface,
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 26a68c8..3a40015 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 
@@ -50,12 +53,12 @@ namespace offapp
     class DriverPoolingSettings
     {
     protected:
-        DECLARE_STL_VECTOR( DriverPooling, DriverSettings );
+        typedef std::vector<DriverPooling> DriverSettings;
         DriverSettings      m_aDrivers;
 
     public:
-        typedef ConstDriverSettingsIterator const_iterator;
-        typedef DriverSettingsIterator      iterator;
+        typedef DriverSettings::const_iterator const_iterator;
+        typedef DriverSettings::iterator iterator;
 
     public:
         DriverPoolingSettings();
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index f3a72bc..3778325 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -272,7 +272,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) throw(Runt
     Sequence< OUString > aNames(m_aBookmarks.size());
     OUString* pNames = aNames.getArray();
     ;
-    for (   ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin();
+    for (   MapIteratorVector::const_iterator aNameIter = m_aBookmarksIndexed.begin();
             aNameIter != m_aBookmarksIndexed.end();
             ++pNames, ++aNameIter
         )
@@ -297,7 +297,7 @@ void OBookmarkContainer::implRemove(const OUString& _rName)
 
     // look for the name in the index access vector
     MapString2String::iterator aMapPos = m_aBookmarks.end();
-    for (   MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin();
+    for (   MapIteratorVector::iterator aSearch = m_aBookmarksIndexed.begin();
             aSearch != m_aBookmarksIndexed.end();
             ++aSearch
         )
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 60de25f..afd2b25 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -23,10 +23,10 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -57,7 +57,7 @@ class OBookmarkContainer
 {
 protected:
     typedef std::map<OUString, OUString> MapString2String;
-    DECLARE_STL_VECTOR(MapString2String::iterator, MapIteratorVector);
+    typedef std::vector<MapString2String::iterator> MapIteratorVector;
 
     MapString2String        m_aBookmarks;           // the bookmarks itself
     MapIteratorVector       m_aBookmarksIndexed;    // for index access to the
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 6f3b682..8863b10 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -487,8 +487,8 @@ void OConnection::disposing()
     OSubComponent::disposing();
     OConnectionWrapper::disposing();
 
-    OWeakRefArrayIterator aEnd = m_aStatements.end();
-    for (OWeakRefArrayIterator i = m_aStatements.begin(); aEnd != i; ++i)
+    OWeakRefArray::iterator aEnd = m_aStatements.end();
+    for (OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i)
     {
         Reference<XComponent> xComp(i->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
@@ -503,8 +503,8 @@ void OConnection::disposing()
 
     ::comphelper::disposeComponent(m_xQueries);
 
-    OWeakRefArrayIterator aComposerEnd = m_aComposers.end();
-    for (OWeakRefArrayIterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
+    OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
+    for (OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
     {
         Reference<XComponent> xComp(j->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 983f43f..8318769 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -23,10 +23,10 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -96,7 +96,7 @@ class ODefinitionContainer
 {
 protected:
     typedef std::map< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent > > Documents;
-    DECLARE_STL_VECTOR(Documents::iterator, DocumentsIndexAccess);
+    typedef std::vector<Documents::iterator> DocumentsIndexAccess;
 
     enum ContainerOperation
     {
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index fd32e6a..eb6db2a 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -20,17 +20,20 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 #define INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 
 // various typedefs
 namespace {
-DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray);
+typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray;
 }
 
 // OSubComponent - a component which holds a hard ref to it's parent
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index a2106c2..706fa32 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 #define INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include "dbadllapi.hxx"
 #include <connectivity/DriversConfig.hxx>
 
@@ -97,7 +100,7 @@ enum DATASOURCE_TYPE
 class OOO_DLLPUBLIC_DBA ODsnTypeCollection
 {
 protected:
-    DECLARE_STL_VECTOR(OUString, StringVector);
+    typedef std::vector<OUString> StringVector;
 
     StringVector    m_aDsnTypesDisplayNames;    /// user readable names for the datasource types
     StringVector    m_aDsnPrefixes;             /// DSN prefixes which determine the type of a datasource
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 07ec808..3ac25d0 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -504,8 +504,8 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
         // we are notifying them, so we must use a copy of m_arrStatusListener, not
         // m_arrStatusListener itself
         Dispatch aNotifyLoop( m_arrStatusListener );
-        DispatchIterator iterSearch = aNotifyLoop.begin();
-        DispatchIterator iterEnd = aNotifyLoop.end();
+        Dispatch::iterator iterSearch = aNotifyLoop.begin();
+        Dispatch::iterator iterEnd = aNotifyLoop.end();
 
         while (iterSearch != iterEnd)
         {
@@ -748,7 +748,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
 
 void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException)
 {
-    DispatchIterator iterSearch = m_arrStatusListener.begin();
+    Dispatch::iterator iterSearch = m_arrStatusListener.begin();
 
     sal_Bool bRemoveForAll = _rURL.Complete.isEmpty();
     while ( iterSearch != m_arrStatusListener.end() )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 165cb8b..f9c264b 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -62,9 +62,9 @@ namespace dbaui
         if (_rLHS.size() != _rRHS.size())
             return sal_False;
 
-        ConstIndexFieldsIterator aLeft = _rLHS.begin();
-        ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
-        ConstIndexFieldsIterator aRight = _rRHS.begin();
+        IndexFields::const_iterator aLeft = _rLHS.begin();
+        IndexFields::const_iterator aLeftEnd = _rLHS.end();
+        IndexFields::const_iterator aRight = _rRHS.begin();
         for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
         {
             if (*aLeft != *aRight)
@@ -669,7 +669,7 @@ DBG_NAME(DbaIndexDialog)
         return sal_True;
     }
 
-    sal_Bool DbaIndexDialog::implCheckPlausibility(const ConstIndexesIterator& _rPos)
+    sal_Bool DbaIndexDialog::implCheckPlausibility(const Indexes::const_iterator& _rPos)
     {
         // need at least one field
         if (0 == _rPos->aFields.size())
@@ -682,7 +682,7 @@ DBG_NAME(DbaIndexDialog)
 
         // no double fields
         std::set< OUString > aExistentFields;
-        for (   ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
+        for (   IndexFields::const_iterator aFieldCheck = _rPos->aFields.begin();
                 aFieldCheck != _rPos->aFields.end();
                 ++aFieldCheck
             )
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 94631f6..e697807 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -181,9 +181,9 @@ DBG_NAME(IndexFieldsControl)
     {
         // do not just copy the array, we may have empty field names (which should not be copied)
         _rFields.resize(m_aFields.size());
-        ConstIndexFieldsIterator aSource = m_aFields.begin();
-        ConstIndexFieldsIterator aSourceEnd = m_aFields.end();
-        IndexFieldsIterator aDest = _rFields.begin();
+        IndexFields::const_iterator aSource = m_aFields.begin();
+        IndexFields::const_iterator aSourceEnd = m_aFields.end();
+        IndexFields::iterator aDest = _rFields.begin();
         for (; aSource < aSourceEnd; ++aSource)
             if (!aSource->sFieldName.isEmpty())
             {
@@ -263,7 +263,7 @@ DBG_NAME(IndexFieldsControl)
         if (!IsEnabled())
             return NULL;
 
-        ConstIndexFieldsIterator aRow;
+        IndexFields::const_iterator aRow;
         sal_Bool bNewField = !implGetFieldDesc(_nRow, aRow);
 
         DbaMouseDownListBoxController* pReturn = NULL;
@@ -288,7 +288,7 @@ DBG_NAME(IndexFieldsControl)
         return pReturn;
     }
 
-    sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, ConstIndexFieldsIterator& _rPos)
+    sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos)
     {
         _rPos = m_aFields.end();
         if ((_nRow < 0) || (_nRow >= (sal_Int32)m_aFields.size()))
@@ -331,7 +331,7 @@ DBG_NAME(IndexFieldsControl)
                     if (nRow >= 0)  // may be -1 in case the control was empty
                     {
                         // remove the field from the selection
-                        IndexFieldsIterator aPos = m_aFields.begin() + nRow;
+                        IndexFields::iterator aPos = m_aFields.begin() + nRow;
 
                         if (bEmptySelected)
                         {
@@ -373,7 +373,7 @@ DBG_NAME(IndexFieldsControl)
 
     void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId)
     {
-        ConstIndexFieldsIterator aFieldDescription;
+        IndexFields::const_iterator aFieldDescription;
         sal_Bool bNewField = !implGetFieldDesc(_nRow, aFieldDescription);
 
         switch (_nColumnId)
@@ -430,7 +430,7 @@ DBG_NAME(IndexFieldsControl)
     }
     OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
     {
-        ConstIndexFieldsIterator aRow = m_aFields.end();
+        IndexFields::const_iterator aRow = m_aFields.end();
         if ( _nRow >= 0 )
         {
             aRow = m_aFields.begin() + _nRow;
@@ -438,7 +438,7 @@ DBG_NAME(IndexFieldsControl)
         }
         return GetRowCellText(aRow,nColId);
     }
-    OUString IndexFieldsControl::GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const
+    OUString IndexFieldsControl::GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const
     {
         if (_rRow < m_aFields.end())
         {
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 598b25f..8849d60 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -336,7 +336,7 @@ DBG_NAME(OParameterDialog)
         m_aVisitedParams[m_nCurrentlySelected] |= EF_VISITED;
 
         // was it the last "not visited yet" entry ?
-        ConstByteVectorIterator aIter;
+        ByteVector::const_iterator aIter;
         for (   aIter = m_aVisitedParams.begin();
                 aIter < m_aVisitedParams.end();
                 ++aIter
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index e87ef13..c63dbe6 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -23,8 +23,8 @@
 #include <sal/config.h>
 
 #include <set>
+#include <vector>
 
-#include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -37,8 +37,8 @@ namespace dbaui
 {
 
     typedef std::set<OUString> StringBag;
-    DECLARE_STL_VECTOR( sal_Int8, ByteVector );
-    DECLARE_STL_VECTOR( OUString, StringArray );
+    typedef std::vector<sal_Int8> ByteVector;
+    typedef std::vector<OUString> StringArray;
 
     typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 7c8f8fd..cbacdfc 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -154,7 +154,7 @@ namespace dbaui
 
         sal_Bool implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection);
 
-        sal_Bool implCheckPlausibility(const ConstIndexesIterator& _rPos);
+        sal_Bool implCheckPlausibility(const Indexes::const_iterator& _rPos);
 
         /** checks if the controls have to be replaced and moved.
         */
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index 398653b..94ba07b 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
 
 namespace dbaui
 {
@@ -33,7 +35,7 @@ namespace dbaui
         OIndexField() : bSortAscending(sal_True) { }
     };
 
-    DECLARE_STL_VECTOR( OIndexField, IndexFields );
+    typedef std::vector<OIndexField> IndexFields;
 
     // OIndex
     struct GrantIndexAccess
@@ -76,7 +78,7 @@ namespace dbaui
         OIndex();   // not implemented
     };
 
-    DECLARE_STL_VECTOR( OIndex, Indexes );
+    typedef std::vector<OIndex> Indexes;
 
 }   // namespace dbaui
 
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 2d5fb71..cbad3b8 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -36,7 +36,7 @@ namespace dbaui
         IndexFields                 m_aSavedValue;
 
         IndexFields                 m_aFields;          // !! order matters !!
-        ConstIndexFieldsIterator    m_aSeekRow;         // !!
+        IndexFields::const_iterator m_aSeekRow;         // !!
 
         Link                        m_aModifyHdl;
 
@@ -79,8 +79,8 @@ namespace dbaui
         void                InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId);
 
     protected:
-        OUString GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const;
-        sal_Bool implGetFieldDesc(long _nRow, ConstIndexFieldsIterator& _rPos);
+        OUString GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const;
+        sal_Bool implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos);
 
         sal_Bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); }
 
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 977d5e3..ddc12ca 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -158,7 +158,7 @@ namespace dbaui
             xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
 
             // the fields
-            for (   ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin();
+            for (   IndexFields::const_iterator aFieldLoop = _rPos->aFields.begin();
                     aFieldLoop != _rPos->aFields.end();
                     ++aFieldLoop
                 )
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index 1b409b3..4ac0eb2 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <set>
+#include <vector>
 
 #include <comphelper/stl_types.hxx>
 
@@ -31,7 +32,7 @@ namespace dbp
 {
 //.........................................................................
 
-    DECLARE_STL_VECTOR( OUString, StringArray );
+    typedef std::vector<OUString> StringArray;
     typedef std::set<OUString> StringBag;
     DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
 
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 7c3ec93..6df275e 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -367,7 +367,7 @@ namespace dbp
 
         // fill the listbox
         m_aDefSelection.Clear();
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for (   StringArray::const_iterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
@@ -452,7 +452,7 @@ namespace dbp
         // fill the list with all available options
         m_aOptions.Clear();
         m_nLastSelection = -1;
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for (   StringArray::const_iterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 724def0..e728485 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -496,7 +496,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
     OUString aName;
     OUString aValue;
 
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
@@ -557,7 +557,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
 
 
     // Aggregate Liste to OUString
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index cbd685c..934c9ef 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "propertybaghelper.hxx"
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/XSQLErrorListener.hpp>
@@ -111,8 +115,7 @@ public:
     }
 };
 
-
-DECLARE_STL_VECTOR(HtmlSuccessfulObj, HtmlSuccessfulObjList);
+typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
 
 //========================================================================
 class OGroupManager;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 0d34521..b17c47c 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -29,7 +33,6 @@
 
 #include <osl/conditn.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 using namespace comphelper;
 
@@ -47,9 +50,9 @@ class OComponentEventThread
             ,public ::com::sun::star::lang::XEventListener
             ,public ::cppu::OWeakObject
 {
-    DECLARE_STL_VECTOR(::com::sun::star::lang::EventObject*, ThreadEvents);
-    DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> , ThreadObjects);
-    DECLARE_STL_VECTOR(sal_Bool,    ThreadBools);
+    typedef std::vector<css::lang::EventObject*> ThreadEvents;
+    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> > ThreadObjects;
+    typedef std::vector<sal_Bool> ThreadBools;
 
     ::osl::Mutex                    m_aMutex;
     ::osl::Condition                m_aCond;            // Queue filled?
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 926c0cf..19b6abb 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -246,7 +246,7 @@ Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
     Sequence<Reference<XControlModel> > aControlModelSeq( nLen );
     Reference<XControlModel>* pModels = aControlModelSeq.getArray();
 
-    ConstOGroupCompArrIterator aGroupComps = m_aCompArray.begin();
+    OGroupCompArr::const_iterator aGroupComps = m_aCompArray.begin();
     for (sal_Int32 i = 0; i < nLen; ++i, ++pModels, ++aGroupComps)
     {
         *pModels = aGroupComps->GetControlModel();
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 05f0936..c0b4009 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -27,11 +27,11 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 
 #include <algorithm>
 #include <map>
+#include <vector>
 
 using namespace comphelper;
 
@@ -120,7 +120,7 @@ public:
     OUString GetName() const { return m_aName; }
 };
 
-DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr);
+typedef std::vector<OGroupComp> OGroupCompArr;
 
 //========================================================================
 class OGroupComp;
@@ -141,7 +141,7 @@ public:
     const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
 };
 
-DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr);
+typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
 
 //========================================================================
 class OGroup
@@ -174,7 +174,7 @@ public:
 };
 
 typedef std::map<OUString, OGroup> OGroupArr;
-DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups);
+typedef std::vector<OGroupArr::iterator> OActiveGroups;
 
 //========================================================================
 class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 8bf420c..93e62e0 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 #define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -27,7 +31,6 @@
 #include <cppuhelper/proptypehlp.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/propagg.hxx>
-#include <comphelper/stl_types.hxx>
 
 using namespace comphelper;
 
@@ -61,7 +64,7 @@ class PropertyInfoService
 
     };
 
-    DECLARE_STL_VECTOR(PropertyAssignment, PropertyMap);
+    typedef std::vector<PropertyAssignment> PropertyMap;
     static PropertyMap      s_AllKnownProperties;
 
     //..................................................................
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 63da1d5..476c164 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -42,7 +42,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
 
     PropertyAssignment aCompareName(_rName, -1);
 
-    ::std::pair<PropertyMapIterator,PropertyMapIterator> aPair = ::std::equal_range(
+    ::std::pair<PropertyMap::iterator,PropertyMap::iterator> aPair = ::std::equal_range(
         s_AllKnownProperties.begin(),
         s_AllKnownProperties.end(),
         aCompareName,
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 9223be9..3795ffb 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <vector>
 #include <map>
 
 #include <stack>
@@ -246,10 +245,6 @@ OutputIter intersperse(
 #define DECLARE_STL_STDKEY_MAP(keytype, valuetype, classname)               \
     DECLARE_STL_MAP(keytype, valuetype, std::less< keytype >, classname)    \
 
-#define DECLARE_STL_VECTOR(valuetyp, classname)     \
-    typedef std::vector< valuetyp >     classname;  \
-    DECLARE_STL_ITERATORS(classname)                \
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 682c04b..3e86a2a 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_GENERICCONTROLLER_HXX
 #define INCLUDED_DBACCESS_GENERICCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <dbaccess/AsyncronousLink.hxx>
 #include <dbaccess/controllerframe.hxx>
 #include <dbaccess/dbaccessdllapi.h>
@@ -226,7 +230,7 @@ namespace dbaui
         };
 
         DECLARE_STL_MAP( sal_uInt16, FeatureState, ::std::less< sal_uInt16 >, StateCache );
-        DECLARE_STL_VECTOR( DispatchTarget, Dispatch);
+        typedef std::vector<DispatchTarget> Dispatch;
 
         FeatureListeners        m_aFeaturesToInvalidate;
 
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index b1f26b6..f435ad5 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
@@ -37,6 +36,7 @@
 #include <osl/thread.hxx>
 
 #include <deque>
+#include <vector>
 
 /**
  * class FmSearchThread
@@ -158,7 +158,7 @@ namespace svxform {
 
 enum FMSEARCH_MODE { SM_BRUTE, SM_ALLOWSCHEDULE, SM_USETHREAD };
 
-DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
+typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray;
 
 class SVX_DLLPUBLIC FmSearchEngine
 {
@@ -187,11 +187,11 @@ class SVX_DLLPUBLIC FmSearchEngine
         sal_Bool                bDoubleHandling;
     };
 
-    DECLARE_STL_VECTOR(FieldInfo, FieldCollection);
+    typedef std::vector<FieldInfo> FieldCollection;
     FieldCollection             m_arrUsedFields;
     sal_Int32                   m_nCurrentFieldIndex;   // the last parameter of RebuildUsedFields, it allows checks in FormatField
 
-    DECLARE_STL_VECTOR(svxform::ControlTextWrapper*, ControlTextSuppliers);
+    typedef std::vector<svxform::ControlTextWrapper*> ControlTextSuppliers;
     ControlTextSuppliers    m_aControlTexts;
 
     sal_Bool                m_bUsingTextComponents;
@@ -200,7 +200,7 @@ class SVX_DLLPUBLIC FmSearchEngine
 
     // Data for the decision in which field a "Found" is accepted
     ::com::sun::star::uno::Any  m_aPreviousLocBookmark;     // position of the last finding
-    FieldCollectionIterator     m_iterPreviousLocField;     // field of the last finding
+    FieldCollection::iterator     m_iterPreviousLocField;     // field of the last finding
 
     // Communication with the thread that does the actual searching
     OUString            m_strSearchExpression;              // forward direction
@@ -354,12 +354,12 @@ private:
     // three methods implementing a complete search loop (null/not null, wildcard, SearchText)
     // (they all have some code in common, but with this solution we have do do a distinction only once per search (before
     // starting the loop), not in every loop step
-    SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
-    SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
-    SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
 
     SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow);
     // call the ProgressHandler with STATE_PROGRESS and the current position of the search iterator
@@ -367,7 +367,7 @@ private:
     // helpers, that are needed several times
     SVX_DLLPRIVATE sal_Bool MoveCursor();
     // moves m_xSearchIterator with respect to direction/overflow cursor
-    SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
     // moves the iterator with respect to the direction/overflow iterator/overflow cursor
     SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField);
     // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3d6a54c..cd81bf3 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -270,7 +270,7 @@ sal_Bool FmSearchEngine::MoveCursor()
 }
 
 //------------------------------------------------------------------------
-sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     sal_Bool bSuccess(sal_True);
     if (m_bForward)
@@ -399,13 +399,13 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // --------------------------------------------------------------
     sal_Bool bFound(sal_False);
@@ -464,13 +464,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     WildCard aSearchExpression(strExpression);
 
@@ -542,7 +542,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     DBG_ASSERT(m_bLevenshtein || m_bRegular,
         "FmSearchEngine::SearchRegularApprox : ungueltiger Suchmodus !");
@@ -553,7 +553,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // Parameter sammeln
     SearchOptions aParam;
@@ -782,7 +782,7 @@ sal_Bool FmSearchEngine::GetCaseSensitive() const
 //------------------------------------------------------------------------
 void FmSearchEngine::clearControlTexts()
 {
-    for (   ControlTextSuppliersIterator aIter = m_aControlTexts.begin();
+    for (   ControlTextSuppliers::iterator aIter = m_aControlTexts.begin();
             aIter < m_aControlTexts.end();
             ++aIter
         )
@@ -1014,9 +1014,9 @@ void FmSearchEngine::SearchNextImpl()
     }
 
     // fuer Arbeit auf Feldliste
-    FieldCollectionIterator iterBegin = m_arrUsedFields.begin();
-    FieldCollectionIterator iterEnd = m_arrUsedFields.end();
-    FieldCollectionIterator iterFieldCheck;
+    FieldCollection::iterator iterBegin = m_arrUsedFields.begin();
+    FieldCollection::iterator iterEnd = m_arrUsedFields.end();
+    FieldCollection::iterator iterFieldCheck;
 
     sal_Int32 nFieldPos;
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 972822a..68a7a36 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4219,7 +4219,7 @@ Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(con
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 #ifdef DBG_UTIL
     // check if we already have a interceptor for the given object
-    for (   ConstInterceptorsIterator aIter = m_aControlDispatchInterceptors.begin();
+    for (   Interceptors::const_iterator aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
         )
@@ -4262,7 +4262,7 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // search the interceptor responsible for the given object
-    InterceptorsIterator aIter;
+    Interceptors::iterator aIter;
     for (   aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index ff78efb..2eb41e9 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -51,7 +51,6 @@
 #include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/container.hxx>
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/compbase6.hxx>
@@ -66,7 +65,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 typedef std::vector<SdrObject*> SdrObjArray;
-DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray);
+typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray;
 
 // catch database exceptions if they occur
 #define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); }
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 61acc34..c74d7e5 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 #define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "delayedevent.hxx"
 #include "formdispatchinterceptor.hxx"
 #include "sqlparserclient.hxx"
@@ -69,7 +73,6 @@
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <vcl/timer.hxx>
 
@@ -205,7 +208,7 @@ namespace svxform
 
         // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
         // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
-        DECLARE_STL_VECTOR(DispatchInterceptionMultiplexer*, Interceptors);
+        typedef std::vector<DispatchInterceptionMultiplexer*> Interceptors;
         Interceptors    m_aControlDispatchInterceptors;
 
     public:
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 4ec5810..53bc30b 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -20,9 +20,9 @@
 #include <unotools/configvaluecontainer.hxx>
 #include <unotools/confignode.hxx>
 #include <tools/debug.hxx>
-#include <comphelper/stl_types.hxx>
 #include <uno/data.h>
 #include <algorithm>
+#include <vector>
 
 #ifdef DBG_UTIL
 #include <rtl/strbuf.hxx>
@@ -205,7 +205,7 @@ namespace utl
         }
     };
 
-    DECLARE_STL_VECTOR( NodeValueAccessor, NodeValueAccessors );
+    typedef std::vector<NodeValueAccessor> NodeValueAccessors;
 
     //=====================================================================
     //= OConfigurationValueContainerImpl
@@ -329,7 +329,7 @@ namespace utl
 
 #ifdef DBG_UTIL
         // another check (should be the first container for this node)
-        ConstNodeValueAccessorsIterator aExistent = ::std::find(
+        NodeValueAccessors::const_iterator aExistent = ::std::find(
             m_pImpl->aAccessors.begin(),
             m_pImpl->aAccessors.end(),
             _rAccessor
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index ffd38778..61b4257 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -17,10 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <unotools/eventlisteneradapter.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 
 //.........................................................................
 namespace utl
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 690345b..d7fb743 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -36,7 +36,7 @@ namespace xmloff
     sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
         sal_Int16 nLeftOver = _nGlobalIndex;
-        ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
+        AttributeListArray::const_iterator aLookupSublist = m_aLists.begin();
 
         for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength());
                 ++aLookupSublist
@@ -55,7 +55,7 @@ namespace xmloff
 
     sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
-        for (   ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
+        for (   AttributeListArray::const_iterator aLookupSublist = m_aLists.begin();
                 aLookupSublist != m_aLists.end();
                 ++aLookupSublist
             )
@@ -74,7 +74,7 @@ namespace xmloff
     sal_Int16 SAL_CALL OAttribListMerger::getLength(  ) throw(RuntimeException)
     {
         sal_Int16 nCount = 0;
-        for (   ConstAttributeListArrayIterator aAccumulate = m_aLists.begin();
+        for (   AttributeListArray::const_iterator aAccumulate = m_aLists.begin();
                 aAccumulate != m_aLists.end();
                 ++aAccumulate
             )
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 6628d9b..b18d031 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -39,7 +42,7 @@ namespace xmloff
     {
     protected:
         ::osl::Mutex        m_aMutex;
-        DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >, AttributeListArray );
+        typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > > AttributeListArray;
         AttributeListArray  m_aLists;
 
         ~OAttribListMerger() { }
commit 4a8175ebeb58555e5d48df134cfaf128293888f1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 5 22:41:15 2013 +0100

    Get rid of DECLARE_STL_USTRINGACCESS_MAP
    
    Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c

diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index 7d8472d..63ff304 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -19,13 +19,16 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_SHAPETOOLBARCONTROLLER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_SHAPETOOLBARCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 
 #include <cppuhelper/implbase2.hxx>
 #include <comphelper/implementationreference.hxx>
-#include <comphelper/stl_types.hxx>
 #include <svtools/toolboxcontroller.hxx>
 
 class SfxToolBoxControl;
@@ -41,7 +44,7 @@ typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::st
 class ShapeToolbarController : public ::svt::ToolboxController
                               ,public ShapeToolbarController_Base
 {
-    DECLARE_STL_USTRINGACCESS_MAP( sal_Bool, TCommandState );
+    typedef std::map<OUString, sal_Bool> TCommandState;
     TCommandState   m_aStates;
     TToolbarHelper  m_pToolbarController;
     sal_uInt16      m_nToolBoxId;
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index cee36fa..8c563b1 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -34,6 +34,7 @@
 
 // header for class SotStorage
 #include <sot/storage.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 61ff126..66817f2 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -25,15 +25,13 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/stl_types.hxx>
-
 
 #include <map>
 
 
 using namespace com::sun::star;
 
-DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence<beans::PropertyValue>, NamedPropertyValues );
+typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues;
 
 class NamedPropertyValuesContainer : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
 {
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index f1ee415..7d19055 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -17,13 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <comphelper/namecontainer.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <comphelper/stl_types.hxx>
 
-DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Any, SvGenericNameContainerMapImpl );
+typedef std::map<OUString, ::com::sun::star::uno::Any> SvGenericNameContainerMapImpl;
 
 namespace comphelper
 {
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index fd052bb..1261db3 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weakagg.hxx>
@@ -41,7 +45,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-DECLARE_STL_USTRINGACCESS_MAP( Any, GenericAnyMapImpl );
+typedef std::map<OUString, Any> GenericAnyMapImpl;
 
 namespace comphelper
 {
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index b6cc41b..4106212 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -19,6 +19,10 @@
 #ifndef CONNECTIVITY_POOLCOLLECTION_HXX
 #define CONNECTIVITY_POOLCOLLECTION_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
@@ -55,7 +59,7 @@ namespace connectivity
 
         //==========================================================================
         typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver >  ODriverCompare;
-        DECLARE_STL_USTRINGACCESS_MAP(OConnectionPool*, OConnectionPools);
+        typedef std::map<OUString, OConnectionPool*> OConnectionPools;
 
         DECLARE_STL_MAP(
                 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 7c3aeef..18b7d05 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -17,8 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
 #ifdef HSQLDB_DBG
+
+#include <map>
+
 #include "accesslog.hxx"
 #include "hsqldb/HStorageMap.hxx"
 
@@ -26,7 +30,7 @@
 
 namespace connectivity { namespace hsqldb
 {
-    DECLARE_STL_USTRINGACCESS_MAP(FILE *,TDebugStreamMap);
+    typedef std::map<OUString, FILE *> TDebugStreamMap;
     TDebugStreamMap& getStreams()
     {
         static TDebugStreamMap streams;
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index 19bdad5..112cba7 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -19,6 +19,10 @@
 #ifndef CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
 #define CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactionListener.hpp>
 #include <com/sun/star/io/XStream.hpp>
@@ -26,7 +30,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <comphelper/stl_types.hxx>
 #include <jni.h>
 //........................................................................
 namespace connectivity
@@ -50,10 +53,10 @@ namespace connectivity
         };
 
 
-        DECLARE_STL_USTRINGACCESS_MAP(::boost::shared_ptr<StreamHelper>,TStreamMap);
+        typedef std::map< OUString, ::boost::shared_ptr<StreamHelper> > TStreamMap;
         typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >, OUString > TStorageURLPair;
         typedef ::std::pair< TStorageURLPair, TStreamMap> TStoragePair;
-        DECLARE_STL_USTRINGACCESS_MAP(TStoragePair,TStorages);
+        typedef std::map<OUString, TStoragePair> TStorages;
         /** contains all storages so far accessed.
         */
         class StorageContainer
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 38cb3b7..383dbc4 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -19,13 +19,16 @@
 #ifndef CONNECTIVITY_MYSQL_DRIVER_HXX
 #define CONNECTIVITY_MYSQL_DRIVER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase3.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include "connectivity/CommonTools.hxx"
 
@@ -48,7 +51,7 @@ namespace connectivity
         typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair;
         typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair;
         typedef ::std::vector< TWeakPair > TWeakPairVector;
-        DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,TJDBCDrivers);
+        typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > > TJDBCDrivers;
 
         /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
 
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index f40e433..20aec32 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -563,7 +563,7 @@ OUString SAL_CALL OSDBCDriverManager::getSingletonName_static(  ) throw(RuntimeE
 Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName ) throw(Exception, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
-    ConstDriverCollectionIterator aSearch = m_aDriversRT.find(_rName);
+    DriverCollection::const_iterator aSearch = m_aDriversRT.find(_rName);
     if (aSearch == m_aDriversRT.end())
         throwNoSuchElementException();
 
@@ -580,7 +580,7 @@ void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const
         _rName
     );
 
-    ConstDriverCollectionIterator aSearch = m_aDriversRT.find(_rName);
+    DriverCollection::const_iterator aSearch = m_aDriversRT.find(_rName);
     if (aSearch == m_aDriversRT.end())
     {
         Reference< XDriver > xNewDriver(_rxObject, UNO_QUERY);
@@ -608,7 +608,7 @@ void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(E
         _rName
     );
 
-    DriverCollectionIterator aSearch = m_aDriversRT.find(_rName);
+    DriverCollection::iterator aSearch = m_aDriversRT.find(_rName);
     if (aSearch == m_aDriversRT.end())
         throwNoSuchElementException();
 
@@ -673,7 +673,7 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
     if ( !xReturn.is() )
     {
         // no -> search the runtime drivers
-        DriverCollectionIterator aPos = ::std::find_if(
+        DriverCollection::iterator aPos = ::std::find_if(
             m_aDriversRT.begin(),       // begin of search range
             m_aDriversRT.end(),         // end of search range
             o3tl::unary_compose< AcceptsURL, ExtractDriverFromCollectionElement >( AcceptsURL( _rURL ), ExtractDriverFromCollectionElement() )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index a311c02..85bfec4 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -20,6 +20,10 @@
 #ifndef _CONNECTIVITY_DRIVERMANAGER_HXX_
 #define _CONNECTIVITY_DRIVERMANAGER_HXX_
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/sdbc/XDriverManager2.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
@@ -40,7 +44,7 @@ namespace drivermanager
     //======================================================================
     //= various
     //======================================================================
-    DECLARE_STL_USTRINGACCESS_MAP( css::uno::Reference< css::sdbc::XDriver >, DriverCollection );
+    typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection;
 
     struct DriverAccess
     {
@@ -70,7 +74,7 @@ namespace drivermanager
 
         // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface,
         // so we have to remember their impl-name in another way
-        DECLARE_STL_USTRINGACCESS_MAP(css::uno::Reference< css::sdbc::XDriver >, DriverCollection);
+        typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection;
         DriverCollection                m_aDriversRT;
 
         ::connectivity::DriversConfig   m_aDriverConfig;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 5e8aeab..53239b3 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -41,6 +41,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <list>
+#include <map>
 #include <algorithm>
 #include <string.h>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -65,7 +66,7 @@ using namespace ::com::sun::star;
 using namespace ::cppu;
 using namespace ::osl;
 
-DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements);
+typedef std::map<OUString, OUStringBuffer> TSQLStatements;
 namespace
 {
     void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions)
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 9313d93..f3a72bc 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -296,7 +296,7 @@ void OBookmarkContainer::implRemove(const OUString& _rName)
     MutexGuard aGuard(m_rMutex);
 
     // look for the name in the index access vector
-    MapString2StringIterator aMapPos = m_aBookmarks.end();
+    MapString2String::iterator aMapPos = m_aBookmarks.end();
     for (   MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin();
             aSearch != m_aBookmarksIndexed.end();
             ++aSearch
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index bdd412e..60de25f 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <comphelper/stl_types.hxx>
@@ -52,8 +56,8 @@ class OBookmarkContainer
             :public OBookmarkContainer_Base
 {
 protected:
-    DECLARE_STL_USTRINGACCESS_MAP(OUString, MapString2String);
-    DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector);
+    typedef std::map<OUString, OUString> MapString2String;
+    DECLARE_STL_VECTOR(MapString2String::iterator, MapIteratorVector);
 
     MapString2String        m_aBookmarks;           // the bookmarks itself
     MapIteratorVector       m_aBookmarksIndexed;    // for index access to the
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 0d66be3..7995269 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "apitools.hxx"
 #include "querycontainer.hxx"
 #include "tablecontainer.hxx"
@@ -43,7 +47,6 @@
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 14
 #include <comphelper/implbase_var.hxx>
 #endif
-#include <comphelper/stl_types.hxx>
 #include <connectivity/ConnectionWrapper.hxx>
 #include <connectivity/warningscontainer.hxx>
 
@@ -92,7 +95,7 @@ protected:
 
     // defines the helper services for example to query the command of a view
     // @ see com.sun.star.sdb.tools.XViewAccess
-    DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, TSupportServices);
+    typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > TSupportServices;
     TSupportServices                m_aSupportServices;
 
     OTableContainer*                m_pTables;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index d5a642f..f13e381 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -521,7 +521,7 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru
     }
 
     // check if URL is already loaded
-    ObjectCacheIterator aExistent = m_aDatabaseObjects.find( sURL );
+    ObjectCache::iterator aExistent = m_aDatabaseObjects.find( sURL );
     if ( aExistent != m_aDatabaseObjects.end() )
         m_aDatabaseObjects.erase( aExistent );
 
@@ -666,7 +666,7 @@ sal_Bool ODatabaseContext::hasByName(const OUString& _rName) throw( RuntimeExcep
 
 Reference< XInterface > ODatabaseContext::getObject( const OUString& _rURL )
 {
-    ObjectCacheIterator aFind = m_aDatabaseObjects.find( _rURL );
+    ObjectCache::iterator aFind = m_aDatabaseObjects.find( _rURL );
     Reference< XInterface > xExistent;
     if ( aFind != m_aDatabaseObjects.end() )
         xExistent = aFind->second->getOrCreateDataSource();
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 459b918..a961168 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "ModelImpl.hxx"
 
 #include <com/sun/star/container/ElementExistException.hpp>
@@ -38,7 +42,6 @@
 #include <com/sun/star/uno/XAggregation.hpp>
 
 #include <basic/basicmanagerrepository.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
@@ -97,10 +100,10 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseRegistrations >
                                     m_xDatabaseRegistrations;
 
-    DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache );
+    typedef std::map<OUString, ODatabaseModelImpl*> ObjectCache;
     ObjectCache     m_aDatabaseObjects;
 
-    DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache );
+    typedef std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > PropertyCache;
     PropertyCache   m_aDatasourceProperties;
         // as we hold our data sources weak, we have to cache all properties on the data sources which are
         // transient but stored as long as the session lasts. The database context is the session (as it lives
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 5c216d9..3740a57 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "ModelImpl.hxx"
 #include "documenteventnotifier.hxx"
 
@@ -165,7 +169,7 @@ class ODatabaseDocument :public ModelDependentComponent             // ModelDepe
         Initialized
     };
 
-    DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController);
+    typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers > > TNumberedController;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2>           m_xUIConfigurationManager;
 
     ::cppu::OInterfaceContainerHelper                                                           m_aModifyListeners;
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 02f6c81..983f43f 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
 #include <comphelper/stl_types.hxx>
@@ -91,7 +95,7 @@ class ODefinitionContainer
             ,public ODefinitionContainer_Base
 {
 protected:
-    DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent >, Documents);
+    typedef std::map< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent > > Documents;
     DECLARE_STL_VECTOR(Documents::iterator, DocumentsIndexAccess);
 
     enum ContainerOperation
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index e61a69f..0d083d0 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -38,8 +38,8 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlimp.hxx>
 #include "apitools.hxx"
-#include <comphelper/stl_types.hxx>
 
+#include <map>
 #include <memory>
 
 namespace dbaxml
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::xml::sax;
 class ODBFilter : public SvXMLImport
 {
 public:
-    DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap);
+    typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap;
     typedef ::std::vector< ::com::sun::star::beans::PropertyValue> TInfoSequence;
 private:
     TPropertyNameMap                                m_aQuerySettings;
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 95cf9fb..e8da81c 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -25,10 +25,11 @@
 #include <tools/rtti.hxx>
 #include <svtools/transfer.hxx>
 
-#include <comphelper/stl_types.hxx>
 #include "callbacks.hxx"
 #include "TableConnectionData.hxx"
 #include "TableWindowData.hxx"
+
+#include <map>
 #include <memory>
 #include <vector>
 
@@ -79,7 +80,7 @@ namespace dbaui
         friend class OJoinMoveTabWinUndoAct;
 
     public:
-        DECLARE_STL_USTRINGACCESS_MAP(OTableWindow*,OTableWindowMap);
+        typedef std::map<OUString, OTableWindow*> OTableWindowMap;
 
     private:
         OTableWindowMap     m_aTableMap;
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 13aea77..ccf4a77 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -19,11 +19,14 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <svtools/editbrowsebox.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/stl_types.hxx>
 #include "moduledbu.hxx"
 
 class Edit;
@@ -38,7 +41,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox
         sal_Int32 nWithGrant;
     } TPrivileges;
 
-    DECLARE_STL_USTRINGACCESS_MAP(TPrivileges,TTablePrivilegeMap);
+    typedef std::map<OUString, TPrivileges> TTablePrivilegeMap;
 
     OModuleClient        m_aModuleClient;
 
diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx
index 4e6882d..f1c525f 100644
--- a/dbaccess/source/ui/inc/toolboxcontroller.hxx
+++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 #include <svtools/toolboxcontroller.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include "apitools.hxx"
 #include "moduledbu.hxx"
+
+#include <map>
 #include <memory>
 
 class PopupMenu;
@@ -35,7 +36,7 @@ namespace dbaui
     class OToolboxController : public ::svt::ToolboxController
                               ,public TToolboxController_BASE
     {
-        DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState);
+        typedef std::map<OUString, sal_Bool> TCommandState;
         OModuleClient   m_aModuleClient;
         TCommandState   m_aStates;
         sal_uInt16      m_nToolBoxId;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index d3c341b..0d412d3 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -220,8 +220,8 @@ void OJoinTableView::Resize()
         // all ok
         return;
 
-    OTableWindowMapIterator aIter = m_aTableMap.begin();
-    OTableWindowMapIterator aEnd = m_aTableMap.end();
+    OTableWindowMap::iterator aIter = m_aTableMap.begin();
+    OTableWindowMap::iterator aEnd = m_aTableMap.end();
     for(;aIter != aEnd;++aIter)
     {
         OTableWindow* pCurrent = aIter->second;
@@ -265,7 +265,7 @@ bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelet
 OTableWindow* OJoinTableView::GetTabWindow( const OUString& rName )
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
-    OTableWindowMapIterator aIter = m_aTableMap.find(rName);
+    OTableWindowMap::iterator aIter = m_aTableMap.find(rName);
 
     return aIter == m_aTableMap.end() ? NULL : aIter->second;
 }
@@ -541,8 +541,8 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
 
         // check occupied areas of this line
         OTableWindow* pOtherTabWin;
-        OTableWindowMapIterator aIter = m_aTableMap.begin();
-        OTableWindowMapIterator aEnd = m_aTableMap.end();
+        OTableWindowMap::iterator aIter = m_aTableMap.begin();
+        OTableWindowMap::iterator aEnd = m_aTableMap.end();
         for(;aIter != aEnd;++aIter)
         {
             pOtherTabWin = aIter->second;
@@ -711,8 +711,8 @@ sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPai
     OTableWindow* pTabWin;
     Point aPos;
 
-    OTableWindowMapIterator aIter = m_aTableMap.begin();
-    OTableWindowMapIterator aEnd = m_aTableMap.end();
+    OTableWindowMap::iterator aIter = m_aTableMap.begin();
+    OTableWindowMap::iterator aEnd = m_aTableMap.end();
     for(;aIter != aEnd;++aIter)
     {
         pTabWin = aIter->second;
@@ -1309,8 +1309,8 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
 
                         sal_Bool bForward = !pKeyEvent->GetKeyCode().IsShift();
                         // is there an active tab win ?
-                        OTableWindowMapIterator aIter = m_aTableMap.begin();
-                        OTableWindowMapIterator aEnd = m_aTableMap.end();
+                        OTableWindowMap::iterator aIter = m_aTableMap.begin();
+                        OTableWindowMap::iterator aEnd = m_aTableMap.end();
                         for(;aIter != aEnd;++aIter)
                             if (aIter->second && aIter->second->HasChildPathFocus())
                                 break;
@@ -1442,8 +1442,8 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
 
                 if (pSearchFor)
                 {
-                    OTableWindowMapIterator aIter = m_aTableMap.begin();
-                    OTableWindowMapIterator aEnd = m_aTableMap.end();
+                    OTableWindowMap::iterator aIter = m_aTableMap.begin();
+                    OTableWindowMap::iterator aEnd = m_aTableMap.end();
                     for(;aIter != aEnd;++aIter)
                     {
                         if (aIter->second == pSearchFor)
@@ -1495,8 +1495,8 @@ void OJoinTableView::StateChanged( StateChangedType nType )
             aFont.Merge( GetControlFont() );
         SetZoomedPointFont( aFont );
 
-        OTableWindowMapIterator aIter = m_aTableMap.begin();
-        OTableWindowMapIterator aEnd = m_aTableMap.end();
+        OTableWindowMap::iterator aIter = m_aTableMap.begin();
+        OTableWindowMap::iterator aEnd = m_aTableMap.end();
         for(;aIter != aEnd;++aIter)
         {
             aIter->second->SetZoom(GetZoom());
@@ -1552,8 +1552,8 @@ void OJoinTableView::clearLayoutInformation()
     m_pLastFocusTabWin  = NULL;
     m_pSelectedConn     = NULL;
     // delete lists
-    OTableWindowMapIterator aIter = m_aTableMap.begin();
-    OTableWindowMapIterator aEnd  = m_aTableMap.end();
+    OTableWindowMap::iterator aIter = m_aTableMap.begin();
+    OTableWindowMap::iterator aEnd  = m_aTableMap.end();
     for(;aIter != aEnd;++aIter)
     {
         if ( aIter->second )
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 5c2ce86..08cb6a1 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -240,7 +240,7 @@ sal_Int32 OQueryTableView::CountTableAlias(const OUString& rName, sal_Int32& rMa
     DBG_CHKTHIS(OQueryTableView,NULL);
     sal_Int32 nRet = 0;
 
-    OTableWindowMapIterator aIter = GetTabWinMap()->find(rName);
+    OTableWindowMap::iterator aIter = GetTabWinMap()->find(rName);
     while(aIter != GetTabWinMap()->end())
     {
         OUString aNewName = OUString(rName) + "_" + OUString::number(++nRet);
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 3506285..30655c9 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1002,7 +1002,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                     OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap();
                     if (pTabWinList)
                     {
-                        OJoinTableView::OTableWindowMapIterator aIter = pTabWinList->find(aAliasName);
+                        OJoinTableView::OTableWindowMap::iterator aIter = pTabWinList->find(aAliasName);
                         if(aIter != pTabWinList->end())
                         {
                             OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second);
@@ -2674,7 +2674,7 @@ sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const O
     OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap();
     if (pTabWinList)
     {
-        OJoinTableView::OTableWindowMapIterator aIter = pTabWinList->find(_sTableName);
+        OJoinTableView::OTableWindowMap::iterator aIter = pTabWinList->find(_sTableName);
         if(aIter != pTabWinList->end())
         {
             OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second);
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx
index 435ef5a..1cb4abf 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -22,9 +22,9 @@
 
 #include <sal/config.h>
 
+#include <map>
 #include <set>
 
-#include <comphelper/stl_types.hxx>
 #include <rtl/ustring.hxx>
 
 //.........................................................................
@@ -34,7 +34,7 @@ namespace abp
 
     typedef std::set<OUString> StringBag;
 
-    DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String );
+    typedef std::map<OUString, OUString> MapString2String;
 
 //.........................................................................
 }   // namespace abp
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index f220fd0..497a7d29 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -251,7 +251,7 @@ namespace abp
                     // there should be a redundancy in the config data .... if this asserts, there isn't anymore!
 
                 // do we have a new alias for the programmatic?
-                MapString2StringIterator aPos = aFieldAssignment.find( *pExistentFields );
+                MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields );
                 if ( aFieldAssignment.end() != aPos )
                 {   // yes
                     // -> set a new value
@@ -269,7 +269,7 @@ namespace abp
 
             // now everything remaining in aFieldAssignment marks a mapping entry which was not present
             // in the config before
-            for (   ConstMapString2StringIterator aNewMapping = aFieldAssignment.begin();
+            for (   MapString2String::const_iterator aNewMapping = aFieldAssignment.begin();
                     aNewMapping != aFieldAssignment.end();
                     ++aNewMapping
                 )
diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx
index 19f76fd..6f23877 100644
--- a/extensions/source/dbpilots/wizardcontext.hxx
+++ b/extensions/source/dbpilots/wizardcontext.hxx
@@ -20,6 +20,10 @@
 #ifndef _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
 #define _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XDatabaseContext.hpp>
@@ -28,7 +32,6 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <comphelper/stl_types.hxx>
 
 //.........................................................................
 namespace dbp
@@ -68,7 +71,7 @@ namespace dbp
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
                     xObjectContainer;
         // the column types container of the object the form is bound to (table, query or SQL statement)
-        DECLARE_STL_USTRINGACCESS_MAP(sal_Int32,TNameTypeMap);
+        typedef std::map<OUString, sal_Int32> TNameTypeMap;
         TNameTypeMap aTypes;
         // the column names of the object the form is bound to (table, query or SQL statement)
         ::com::sun::star::uno::Sequence< OUString >
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index c4a138f..273df2b 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -24,10 +24,10 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <comphelper/stl_types.hxx>
 
 #include "xmlfilterjar.hxx"
 
+#include <map>
 #include <vector>
 #include <stack>
 
@@ -48,7 +48,7 @@ enum ImportState
     e_Unknown
 };
 
-DECLARE_STL_USTRINGACCESS_MAP( OUString, PropertyMap );
+typedef std::map<OUString, OUString> PropertyMap;
 
 struct Node
 {
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 7747c41..05f0936 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -31,6 +31,7 @@
 #include <comphelper/types.hxx>
 
 #include <algorithm>
+#include <map>
 
 using namespace comphelper;
 
@@ -172,7 +173,7 @@ public:
         { return m_aCompArray[nP].GetComponent(); }
 };
 
-DECLARE_STL_USTRINGACCESS_MAP(OGroup, OGroupArr);
+typedef std::map<OUString, OGroup> OGroupArr;
 DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups);
 
 //========================================================================
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index bc2b8a4..34b12e1 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -20,9 +20,12 @@
 #ifndef INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
 #define INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
@@ -44,7 +47,7 @@ struct PropertyMapEntry
     sal_uInt8 mnMemberId;
 };
 
-DECLARE_STL_USTRINGACCESS_MAP( PropertyMapEntry*, PropertyMap );
+typedef std::map<OUString, PropertyMapEntry*> PropertyMap;
 
 class PropertyMapImpl;
 
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 228da5b..9223be9 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -250,10 +250,6 @@ OutputIter intersperse(
     typedef std::vector< valuetyp >     classname;  \
     DECLARE_STL_ITERATORS(classname)                \
 
-#define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname)                 \
-    typedef std::map< OUString, valuetype > classname; \
-    DECLARE_STL_ITERATORS(classname)
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index c976de9..b2f2c76 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 9a1a1ab..3298bf9 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 c87cae1..4214197 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;
 
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index f633259..860e902 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -20,10 +20,13 @@
 #ifndef _REPORT_RPTUIDEF_HXX
 #define _REPORT_RPTUIDEF_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "dllapi.h"
 #include <tools/solar.h>
 #include <svx/svdobj.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 #include <svx/fmglob.hxx>
 #include <boost/shared_ptr.hpp>
@@ -92,7 +95,7 @@ public:
 */
 REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
 typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter;
-DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair);
+typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
 /** returns the property name map for the givern property id
     @param  _nObjectId  the object id
 */
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index b31940d..c410784 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -37,9 +37,9 @@
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <map>
 #include <memory>
 #include <boost/shared_ptr.hpp>
 #include <xmloff/prhdlfac.hxx>
@@ -68,8 +68,8 @@ using namespace ::com::sun::star::xml::sax;
 class ORptFilter : public SvXMLImport
 {
 public:
-    DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap);
-    DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap);
+    typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap;
+    typedef std::map< OUString, Reference<XFunction> > TGroupFunctionMap;
 private:
 
     TGroupFunctionMap                               m_aFunctions;
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index bb9cb85..2aba9c7 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -24,10 +24,9 @@
 #include <com/sun/star/report/meta/XFunctionManager.hpp>
 #include <com/sun/star/report/meta/XFunctionCategory.hpp>
 #include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <map>
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <comphelper/stl_types.hxx>
-
 
 namespace rptui
 {
@@ -37,8 +36,8 @@ class FunctionDescription;
 //============================================================================
 class FunctionManager : public formula::IFunctionManager
 {
-    DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionDescription >,  TFunctionsMap);
-    DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionCategory > ,    TCategoriesMap);
+    typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap;
+    typedef std::map< OUString, ::boost::shared_ptr< FunctionCategory > > TCategoriesMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr;
     mutable TCategoriesMap  m_aCategories;
     mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex;
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index b58aea2..da96246 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -19,8 +19,11 @@
 #ifndef RPTUI_TOOLBOXCONTROLLER_HXX
 #define RPTUI_TOOLBOXCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <svtools/toolboxcontroller.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
@@ -37,7 +40,7 @@ namespace rptui
     class OToolboxController : public ::svt::ToolboxController
                               ,public TToolboxController_BASE
     {
-        DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState);
+        typedef std::map<OUString, sal_Bool> TCommandState;
         TCommandState   m_aStates;
         TToolbarHelper  m_pToolbarController;
         sal_uInt16      m_nToolBoxId;
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index cc9890e..a9688e4 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
 
 #include <ReportControllerObserver.hxx>
 #include <ReportController.hxx>
@@ -39,7 +42,7 @@ namespace rptui
 
     using namespace ::com::sun::star;
 
-DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties);
+typedef std::map<OUString, bool> AllProperties;
 DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache);
 
 class OXReportControllerObserverImpl
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 0c4608e..b84ab27 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -17,9 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
 
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/svdobj.hxx>
@@ -47,7 +49,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *,  ScShapeImplementationIdMap );
+typedef std::map<OUString, uno::Sequence< sal_Int8 > *> ScShapeImplementationIdMap;
 
 static ScShapeImplementationIdMap aImplementationIdMap;
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 1e16126..8b03e4b 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <svtools/extcolorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -34,8 +38,6 @@
 #include <vcl/event.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
-#include <comphelper/stl_types.hxx>
-
 
 //-----------------------------------------------------------------------------
 using namespace utl;
@@ -56,11 +58,11 @@ ExtendedColorConfig_Impl*    ExtendedColorConfig::m_pImpl = NULL;
 
 class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
 {
-    DECLARE_STL_USTRINGACCESS_MAP( OUString, TDisplayNames);
-    DECLARE_STL_USTRINGACCESS_MAP(ExtendedColorConfigValue,TConfigValues);
+    typedef std::map<OUString, OUString> TDisplayNames;

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list