From ca8787a98171070c771dc167b43d5bdb98c52ce4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 4 Jan 2015 11:10:45 +0000
Subject: boost::unordered_map->std::unordered_map

Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
---
 scripting/source/dlgprov/dlgevtatt.hxx             | 11 +++--------
 scripting/source/provider/ActiveMSPList.hxx        | 22 +++++++++-------------
 .../source/provider/BrowseNodeFactoryImpl.cxx      |  8 +++-----
 scripting/source/provider/ProviderCache.hxx        |  5 +++--
 scripting/source/stringresource/stringresource.hxx |  6 +++---
 scripting/source/vbaevents/eventhelper.cxx         |  6 +++---
 6 files changed, 24 insertions(+), 34 deletions(-)

(limited to 'scripting')

diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index de1ff424b1ab..b66260303c39 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -32,20 +32,15 @@
 
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
 
 namespace dlgprov
 {
-
-
-
     // class DialogEventsAttacherImpl
-
-    typedef boost::unordered_map< OUString,
+    typedef std::unordered_map< OUString,
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >,
         OUStringHash,
-        ::std::equal_to< OUString > > ListenerHash;
+        std::equal_to< OUString > > ListenerHash;
 
     typedef ::cppu::WeakImplHelper1<
         ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 9b2e80329643..93e4bc8f87d0 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -19,9 +19,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_ACTIVEMSPLIST_HXX
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_ACTIVEMSPLIST_HXX
 
-#include <boost/unordered_map.hpp>
-#include <map>
-
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -36,22 +33,21 @@
 
 #include <comphelper/stl_types.hxx>
 
+#include <map>
+#include <unordered_map>
+
 namespace func_provider
 {
 
 //Typedefs
+typedef std::map  <   css::uno::Reference< css::uno::XInterface >
+                  ,   css::uno::Reference< css::script::provider::XScriptProvider >
+                  ,   ::comphelper::OInterfaceCompare< css::uno::XInterface >
+                  >   ScriptComponent_map;
 
-
-
-typedef ::std::map  <   css::uno::Reference< css::uno::XInterface >
-                    ,   css::uno::Reference< css::script::provider::XScriptProvider >
-                    ,   ::comphelper::OInterfaceCompare< css::uno::XInterface >
-                    >   ScriptComponent_map;
-
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
     css::uno::Reference< css::script::provider::XScriptProvider >,
-    OUStringHash,
-            ::std::equal_to< OUString > > Msp_hash;
+    OUStringHash, std::equal_to< OUString > > Msp_hash;
 
 class NonDocMSPCreator;
 
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 4a8af6affaf3..9407a1ca5b5c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -158,13 +158,11 @@ public:
     }
 };
 
-
-//typedef ::std::map< OUString, Reference< browse::XBrowseNode > >
-typedef ::boost::unordered_map< OUString, Reference< browse::XBrowseNode >,
+//typedef std::map< OUString, Reference< browse::XBrowseNode > >
+typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >,
     OUStringHash, ::std::equal_to< OUString > >
         BrowseNodeAggregatorHash;
-typedef ::std::vector< OUString > vString;
-
+typedef std::vector< OUString > vString;
 
 struct alphaSort
 {
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index c446dfd5a96c..b3658876fd81 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_PROVIDERCACHE_HXX
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_PROVIDERCACHE_HXX
 
-#include <boost/unordered_map.hpp>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -33,6 +32,8 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 
+#include <unordered_map>
+
 namespace func_provider
 {
 
@@ -45,7 +46,7 @@ struct ProviderDetails
     css::uno::Reference< css::lang::XSingleComponentFactory > factory;
     css::uno::Reference< css::script::provider::XScriptProvider > provider;
 };
-typedef ::boost::unordered_map < OUString, ProviderDetails , OUStringHash,
+typedef std::unordered_map < OUString, ProviderDetails , OUStringHash,
             ::std::equal_to< OUString > > ProviderDetails_hash;
 
 
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index a3493797e69e..ff750bdda48b 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -33,8 +33,8 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
 
+#include <unordered_map>
 #include <vector>
-#include <boost/unordered_map.hpp>
 
 
 namespace stringresource
@@ -53,7 +53,7 @@ namespace stringresource
 
 
 // Hashtable to map string ids to string
-typedef boost::unordered_map
+typedef std::unordered_map
 <
     OUString,
     OUString,
@@ -61,7 +61,7 @@ typedef boost::unordered_map
 >
 IdToStringMap;
 
-typedef boost::unordered_map
+typedef std::unordered_map
 <
     OUString,
     sal_Int32,
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index d0b97dbf0330..5ab80dfab21f 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -76,7 +76,7 @@
 #include <comphelper/evtmethodhelper.hxx>
 
 #include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 
 #include <service.hxx>
 
@@ -192,7 +192,7 @@ struct TranslateInfo
 };
 
 
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
 std::list< TranslateInfo >,
 OUStringHash,
 ::std::equal_to< OUString > > EventInfoHash;
@@ -498,7 +498,7 @@ public:
     { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
 private:
 
-typedef boost::unordered_map< OUString, Any, OUStringHash,
+typedef std::unordered_map< OUString, Any, OUStringHash,
 ::std::equal_to< OUString > > EventSupplierHash;
 
     EventSupplierHash m_hEvents;
-- 
cgit