From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 19 Oct 2017 17:18:17 +0200
Subject: overload std::hash for OUString and OString

no need to explicitly specify it anymore

Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec
Reviewed-on: https://gerrit.libreoffice.org/43567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 scripting/source/dlgprov/dlgevtatt.hxx              | 3 +--
 scripting/source/provider/ActiveMSPList.hxx         | 3 +--
 scripting/source/provider/BrowseNodeFactoryImpl.cxx | 5 +----
 scripting/source/provider/ProviderCache.hxx         | 2 +-
 scripting/source/stringresource/stringresource.hxx  | 6 ++----
 scripting/source/vbaevents/eventhelper.cxx          | 5 ++---
 6 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'scripting')

diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 814d71dbde7b..b4df1c516684 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -38,8 +38,7 @@ namespace dlgprov
 {
     // class DialogEventsAttacherImpl
     typedef std::unordered_map< OUString,
-        css::uno::Reference< css::script::XScriptListener >,
-        OUStringHash > ListenerHash;
+        css::uno::Reference< css::script::XScriptListener > > ListenerHash;
 
     typedef ::cppu::WeakImplHelper<
         css::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 1adbb7fe0d77..7539b3ba4f36 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -45,8 +45,7 @@ typedef std::map  <   css::uno::Reference< css::uno::XInterface >
                   >   ScriptComponent_map;
 
 typedef std::unordered_map< OUString,
-    css::uno::Reference< css::script::provider::XScriptProvider >,
-    OUStringHash > Msp_hash;
+    css::uno::Reference< css::script::provider::XScriptProvider > > Msp_hash;
 
 class NonDocMSPCreator;
 
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index aafa2f1d5e03..49c51dba6c07 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -150,10 +150,7 @@ public:
     }
 };
 
-//typedef std::map< OUString, Reference< browse::XBrowseNode > >
-typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >,
-    OUStringHash >
-        BrowseNodeAggregatorHash;
+typedef std::unordered_map< OUString, Reference< browse::XBrowseNode > >  BrowseNodeAggregatorHash;
 typedef std::vector< OUString > vString;
 
 struct alphaSort
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 75e062073c9f..d6a950beee40 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -44,7 +44,7 @@ struct ProviderDetails
     css::uno::Reference< css::lang::XSingleComponentFactory > factory;
     css::uno::Reference< css::script::provider::XScriptProvider > provider;
 };
-typedef std::unordered_map < OUString, ProviderDetails , OUStringHash > ProviderDetails_hash;
+typedef std::unordered_map < OUString, ProviderDetails  > ProviderDetails_hash;
 
 
 class ProviderCache
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 952dfd4b5d70..860c455e73d4 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -53,16 +53,14 @@ namespace stringresource
 typedef std::unordered_map
 <
     OUString,
-    OUString,
-    OUStringHash
+    OUString
 >
 IdToStringMap;
 
 typedef std::unordered_map
 <
     OUString,
-    sal_Int32,
-    OUStringHash
+    sal_Int32
 >
 IdToIndexMap;
 
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 9690771027b1..5d47ea381444 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -174,8 +174,7 @@ struct TranslateInfo
 
 typedef std::unordered_map<
     OUString,
-    std::list< TranslateInfo >,
-    OUStringHash > EventInfoHash;
+    std::list< TranslateInfo > > EventInfoHash;
 
 
 struct TranslatePropMap
@@ -470,7 +469,7 @@ public:
     { return !m_hEvents.empty(); }
 private:
 
-typedef std::unordered_map< OUString, Any, OUStringHash > EventSupplierHash;
+typedef std::unordered_map< OUString, Any > EventSupplierHash;
 
     EventSupplierHash m_hEvents;
 };
-- 
cgit