Get rid of DECLARE_STL_USTRINGACCESS_MAP

Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c

15 files changed, 63 insertions, 39 deletions

diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 5e8aeabc0725..53239b3dd499 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 9313d9357431..f3a72bcb20d1 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 bdd412ec67aa..60de25f2632d 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 0d66be3bab03..79952694ab33 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 d5a642f6a9df..f13e381f90ae 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 459b91802b07..a961168dd428 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 5c216d9f96ce..3740a57ef6ec 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 02f6c81c3a33..983f43f2fd6f 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 e61a69f8aa02..0d083d0238d0 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 95cf9fbb15f4..e8da81c3bbd1 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 13aea774be4d..ccf4a77d4ca3 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 4e6882d28c97..f1c525fd068f 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 d3c341b6ed06..0d412d3b092e 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 5c2ce8656886..08cb6a174367 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 3506285993a4..30655c924c3a 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);