Get rid of DECLARE_STL_USTRINGACCESS_MAP

Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c

3 files changed, 16 insertions, 12 deletions

diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 1e1612671565..8b03e4bf51cc 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;
+    typedef std::map<OUString, ExtendedColorConfigValue> TConfigValues;
     typedef ::std::vector<TConfigValues::iterator> TMapPos;
     typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping;
-    DECLARE_STL_USTRINGACCESS_MAP(TComponentMapping,TComponents);
+    typedef std::map<OUString, TComponentMapping> TComponents;
     TComponents         m_aConfigValues;
     TDisplayNames       m_aComponentDisplayNames;
     ::std::vector<TComponents::iterator> m_aConfigValuesPos;
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index d9f0d3d8db0e..c3839a81fdbd 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
 
 #include <svtools/helpopt.hxx>
 #include <unotools/configmgr.hxx>
@@ -26,7 +29,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/help.hxx>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 
 #include "itemholder2.hxx"
 
@@ -53,7 +55,7 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
     OUString        aSystem;
     OUString        sHelpStyleSheet;
 
-    DECLARE_STL_USTRINGACCESS_MAP( sal_Int32, MapString2Int );
+    typedef std::map <OUString, sal_Int32> MapString2Int;
     MapString2Int   aURLIgnoreCounters;
     ::osl::Mutex    aIgnoreCounterSafety;
 
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index fc4a4810f463..bcf1eb455c8f 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -28,7 +28,6 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/waitobj.hxx>
@@ -51,6 +50,7 @@
 #include "svl/filenotation.hxx"
 #include <tools/urlobj.hxx>
 #include <algorithm>
+#include <map>
 
 // .......................................................................
 namespace svt
@@ -72,7 +72,7 @@ namespace svt
 
     typedef std::vector<OUString> StringArray;
     typedef std::set<OUString> StringBag;
-    DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String );
+    typedef std::map<OUString, OUString> MapString2String;
 
     namespace
     {
@@ -224,7 +224,7 @@ public:
     // -------------------------------------------------------------------
     sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName)
     {
-        ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName );
+        MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName );
         return  ( m_aAliases.end() != aPos )
             &&  ( !aPos->second.isEmpty() );
     }
@@ -233,7 +233,7 @@ public:
     OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName)
     {
         OUString sReturn;
-        ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName );
+        MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName );
         if ( m_aAliases.end() != aPos )
             sReturn = aPos->second;
 
@@ -249,7 +249,7 @@ public:
     // -------------------------------------------------------------------
     void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName)
     {
-        MapString2StringIterator aPos = m_aAliases.find( _rLogicalName );
+        MapString2String::iterator aPos = m_aAliases.find( _rLogicalName );
         if ( m_aAliases.end() != aPos )
             m_aAliases.erase( aPos );
     }