boost::unordered_map->std::unordered_map

you can get debug stl this way

Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19

10 files changed, 23 insertions, 24 deletions

diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 4fcd5815e615..129cddec2a54 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
 #include <cassert>
 #include <com/sun/star/awt/XRequestCallback.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -195,6 +194,7 @@
 #include <ucbhelper/interactionrequest.hxx>
 #include <ucbhelper/interceptedinteraction.hxx>
 #include <uno/data.h>
+#include <unordered_map>
 #include <vector>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 76527d86def5..d343e9ffa347 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -31,7 +31,7 @@
 #include "itemholder1.hxx"
 
 #include <algorithm>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 
 using namespace ::std;
 using namespace ::utl;
@@ -76,7 +76,7 @@ class SvtCmdOptions
         }
 
     private:
-        typedef boost::unordered_map<OUString, sal_Int32, OUStringHash>
+        typedef std::unordered_map<OUString, sal_Int32, OUStringHash>
             CommandHashMap;
 
         CommandHashMap m_aCommandHashMap;
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index ef1f984b4eb7..e98cb00ffb2c 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/weakref.hxx>
 
-#include <boost/unordered_map.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 75e511bc8caa..e079c937a7df 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -28,10 +28,10 @@
 
 #include <unotools/pathoptions.hxx>
 
-#include <boost/unordered_map.hpp>
-
 #include "itemholder1.hxx"
 
+#include <unordered_map>
+
 using namespace ::utl;
 using namespace ::osl;
 using namespace ::com::sun::star::uno;
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno;
 
 #define PROPERTYCOUNT                   1
 
-typedef boost::unordered_map<OUString, sal_Int32, OUStringHash>
+typedef std::unordered_map<OUString, sal_Int32, OUStringHash>
     ExtensionHashMap;
 
 class SvtExtendedSecurityOptions_Impl : public ConfigItem
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index f84591970b3a..77d57a1cd431 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -165,7 +165,7 @@ OUString DefaultFontConfiguration::tryLocale( const OUString& rBcp47, const OUSt
 {
     OUString aRet;
 
-    boost::unordered_map< OUString, LocaleAccess, OUStringHash >::const_iterator it = m_aConfig.find( rBcp47 );
+    std::unordered_map< OUString, LocaleAccess, OUStringHash >::const_iterator it = m_aConfig.find( rBcp47 );
     if( it != m_aConfig.end() )
     {
         if( !it->second.xAccess.is() )
@@ -1021,7 +1021,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R
 
 void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const
 {
-    boost::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator it = m_aSubst.find( rBcp47 );
+    std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator it = m_aSubst.find( rBcp47 );
     if( it != m_aSubst.end() )
     {
         if( ! it->second.bConfigRead )
@@ -1121,7 +1121,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN
 
     for (::std::vector< OUString >::const_iterator fb( aFallbacks.begin()); fb != aFallbacks.end(); ++fb)
     {
-        boost::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator lang = m_aSubst.find( *fb );
+        std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator lang = m_aSubst.find( *fb );
         if( lang != m_aSubst.end() )
         {
             if( ! lang->second.bConfigRead )
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index d831914fc5f8..92a1ba278371 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -24,9 +24,10 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
 
-#include <boost/unordered_map.hpp>
 #include "itemholder1.hxx"
 
+#include <unordered_map>
+
 using namespace utl;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
@@ -42,7 +43,7 @@ static sal_Int32                    nRefCount = 0;
 class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
 {
 private:
-    typedef boost::unordered_map< OUString, sal_Bool, OUStringHash, ::std::equal_to< OUString > > OptionNodeList;
+    typedef std::unordered_map< OUString, sal_Bool, OUStringHash, std::equal_to< OUString > > OptionNodeList;
 
     OUString        m_sPathDelimiter;
     OptionNodeList  m_aOptionNodeList;
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 42a2caa5c82b..4473397b2ea9 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -44,8 +44,8 @@
 
 #include "itemholder1.hxx"
 
+#include <unordered_map>
 #include <vector>
-#include <boost/unordered_map.hpp>
 
 using namespace osl;
 using namespace utl;
@@ -72,11 +72,11 @@ enum VarNameProperty
     VAR_NEEDS_FILEURL
 };
 
-typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap;
+typedef std::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap;
 
-typedef boost::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap;
+typedef std::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap;
 
-typedef boost::unordered_map<OUString, VarNameProperty, OUStringHash>
+typedef std::unordered_map<OUString, VarNameProperty, OUStringHash>
     VarNameToEnumMap;
 
 // class SvtPathOptions_Impl ---------------------------------------------
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 403a82b053a2..9f078e10556e 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -20,7 +20,6 @@
 #include <unotools/viewoptions.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-#include <boost/unordered_map.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 01f329b22066..5adcbdcea009 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -34,7 +34,7 @@ AtomProvider::~AtomProvider()
 
 int AtomProvider::getAtom( const OUString& rString, bool bCreate )
 {
-    ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString );
+    std::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString );
     if( it != m_aAtomMap.end() )
         return it->second;
     if( ! bCreate )
@@ -48,7 +48,7 @@ int AtomProvider::getAtom( const OUString& rString, bool bCreate )
 const OUString& AtomProvider::getString( int nAtom ) const
 {
     static OUString aEmpty;
-    ::boost::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom );
+    std::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom );
 
     return it == m_aStringMap.end() ? aEmpty : it->second;
 }
@@ -59,13 +59,13 @@ MultiAtomProvider::MultiAtomProvider()
 
 MultiAtomProvider::~MultiAtomProvider()
 {
-    for( ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it )
+    for( std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it )
         delete it->second;
 }
 
 int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate )
 {
-    ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it =
+    std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it =
           m_aAtomLists.find( atomClass );
     if( it != m_aAtomLists.end() )
         return it->second->getAtom( rString, bCreate );
@@ -81,7 +81,7 @@ int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCr
 
 const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const
 {
-    ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it =
+    std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it =
           m_aAtomLists.find( atomClass );
     if( it != m_aAtomLists.end() )
         return it->second->getString( atom );
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index 79f282143f8c..37915aab5a07 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -19,8 +19,8 @@
 
 #include <unotools/fontdefs.hxx>
 #include <unotools/fontcfg.hxx>
-#include <boost/unordered_map.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <unordered_map>
 
 struct ImplLocalizedFontName
 {
@@ -421,7 +421,7 @@ OUString GetEnglishSearchFontName(const OUString& rInName)
     // translate normalized localized name to its normalized English ASCII name
     if( bNeedTranslation )
     {
-        typedef boost::unordered_map<const OUString, const char*, OUStringHash> FontNameDictionary;
+        typedef std::unordered_map<const OUString, const char*, OUStringHash> FontNameDictionary;
         static FontNameDictionary aDictionary( SAL_N_ELEMENTS(aImplLocalizedNamesList) );
         // the font name dictionary needs to be intialized once
         if( aDictionary.empty() )