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>

13 files changed, 19 insertions, 20 deletions

diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 472faddf823f..be47d59bddcd 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -42,7 +42,7 @@ class SfxObjectShell;
 class ScUnoAddInFuncData;
 class ScFuncDesc;
 
-typedef std::unordered_map< OUString, const ScUnoAddInFuncData*, OUStringHash > ScAddInHashMap;
+typedef std::unordered_map< OUString, const ScUnoAddInFuncData* > ScAddInHashMap;
 
 enum ScAddInArgumentType
 {
diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx
index d0bbc05e5ead..0c6d8421bf79 100644
--- a/sc/inc/autonamecache.hxx
+++ b/sc/inc/autonamecache.hxx
@@ -26,7 +26,7 @@
 #include "global.hxx"
 
 typedef std::vector< ScAddress > ScAutoNameAddresses;
-typedef std::unordered_map< OUString, ScAutoNameAddresses, OUStringHash > ScAutoNameHashMap;
+typedef std::unordered_map< OUString, ScAutoNameAddresses > ScAutoNameHashMap;
 
 /**  Cache for faster lookup of automatic names during CompileXML
      (during CompileXML, no document content is changed). */
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index c461867eae5a..3fde82bea979 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -128,7 +128,7 @@ class SC_DLLPUBLIC ScChartListenerCollection
 {
 public:
     typedef std::map<OUString, std::unique_ptr<ScChartListener>> ListenersType;
-    typedef std::unordered_set<OUString, OUStringHash> StringSetType;
+    typedef std::unordered_set<OUString> StringSetType;
 private:
     ListenersType m_Listeners;
     enum UpdateStatus
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 3bac2751600d..8601d7177aae 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -43,7 +43,7 @@ struct ScDPNumGroupInfo;
 class SC_DLLPUBLIC ScDPCache
 {
 public:
-    typedef std::unordered_set<OUString, OUStringHash> StringSetType;
+    typedef std::unordered_set<OUString> StringSetType;
     typedef mdds::flat_segment_tree<SCROW, bool> EmptyRowsType;
     typedef std::vector<ScDPItemData> ScDPItemDataVec;
     typedef std::set<ScDPObject*> ScDPObjectSet;
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 1eddcf931e34..421d61f2b3e9 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -119,7 +119,7 @@ public:
 
 class ScDPGroupTableData : public ScDPTableData
 {
-    typedef std::unordered_set< OUString, OUStringHash > StringHashSet;
+    typedef std::unordered_set< OUString > StringHashSet;
 
     std::shared_ptr<ScDPTableData> pSourceData;
     long                    nSourceCount;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 6564b9b34f30..b88b08161495 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -111,8 +111,8 @@ private:
     css::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level)
 
 public:
-    typedef std::unordered_set<OUString, OUStringHash> MemberSetType;
-    typedef std::unordered_map <OUString, ScDPSaveMember*, OUStringHash> MemberHash;
+    typedef std::unordered_set<OUString> MemberSetType;
+    typedef std::unordered_map <OUString, ScDPSaveMember*> MemberHash;
     typedef std::list <ScDPSaveMember*> MemberList;
 
 private:
@@ -220,7 +220,7 @@ public:
 
     void WriteToSource( const css::uno::Reference<css::uno::XInterface>& xDim );
 
-    void UpdateMemberVisibility(const std::unordered_map< OUString, bool, OUStringHash>& rData);
+    void UpdateMemberVisibility(const std::unordered_map< OUString, bool>& rData);
 
     bool HasInvisibleMember() const;
 
@@ -233,9 +233,9 @@ public:
 
 class ScDPSaveData
 {
-    typedef std::unordered_map<OUString, size_t, OUStringHash> DupNameCountType;
+    typedef std::unordered_map<OUString, size_t> DupNameCountType;
 public:
-    typedef std::unordered_map<OUString, size_t, OUStringHash> DimOrderType;
+    typedef std::unordered_map<OUString, size_t> DimOrderType;
     typedef std::vector<std::unique_ptr<ScDPSaveDimension>> DimsType;
 
 private:
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index c0a29c8ae52f..a0f8048f82ce 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -674,7 +674,7 @@ private:
         size_t operator()(const ScDPItemData& r) const;
     };
     typedef std::unordered_set<ScDPItemData, MemberHash> VisibleMemberType;
-    typedef std::unordered_map<OUString, VisibleMemberType, OUStringHash> DimMemberType;
+    typedef std::unordered_map<OUString, VisibleMemberType> DimMemberType;
     DimMemberType maDimensions;
 
     ScDPSource* mpSource;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 3d6af78e5cd6..f7bc070e81fa 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -547,7 +547,7 @@ public:
 };
 
 // hash map from name to index in the member array, for fast name access
-typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap;
+typedef std::unordered_map< OUString, sal_Int32 > ScDPMembersHashMap;
 
 class ScDPMembers : public cppu::WeakImplHelper<
                             css::sheet::XMembersAccess,
diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx
index 980b5594e0fc..abb77dbbb9dd 100644
--- a/sc/inc/dptypes.hxx
+++ b/sc/inc/dptypes.hxx
@@ -14,7 +14,7 @@
 
 #include <unordered_set>
 
-typedef std::unordered_set<OUString, OUStringHash> ScDPUniqueStringSet;
+typedef std::unordered_set<OUString> ScDPUniqueStringSet;
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 30bc8136b034..19414e2a2084 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -189,7 +189,7 @@ public:
     };
 
     typedef std::shared_ptr<Table> TableTypeRef;
-    typedef std::unordered_map< OUString, size_t, OUStringHash>
+    typedef std::unordered_map< OUString, size_t>
         TableNameIndexMap;
 
     ScExternalRefCache();
@@ -319,9 +319,9 @@ private:
         }
     };
 
-    typedef std::unordered_map<OUString, TokenArrayRef, OUStringHash> RangeNameMap;
+    typedef std::unordered_map<OUString, TokenArrayRef> RangeNameMap;
     typedef std::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap;
-    typedef std::unordered_map<OUString, OUString, OUStringHash> NamePairMap;
+    typedef std::unordered_map<OUString, OUString> NamePairMap;
 
     /** Represents data cached for a single external document. */
     struct DocItem
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx
index ba8b1c51d499..8b66791afa39 100644
--- a/sc/inc/formulaparserpool.hxx
+++ b/sc/inc/formulaparserpool.hxx
@@ -43,8 +43,7 @@ public:
 private:
     typedef std::unordered_map<
         OUString,
-        css::uno::Reference< css::sheet::XFormulaParser >,
-        OUStringHash > ParserMap;
+        css::uno::Reference< css::sheet::XFormulaParser > > ParserMap;
 
     const ScDocument&   mrDoc;
     ParserMap           maParsers;
diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx
index 02156f155ece..e524ff59bad2 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -38,7 +38,7 @@ public:
     void BroadcastModuleUpdate(const OUString& aModuleName);
 
 private:
-    typedef std::unordered_map< OUString, bool, OUStringHash > NameBoolMap;
+    typedef std::unordered_map< OUString, bool > NameBoolMap;
     NameBoolMap mhFuncToVolatile;
     css::uno::Reference< css::container::XContainerListener > mxContainerListener;
 
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 107d2b5e2e9c..238a50983c03 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -104,7 +104,7 @@ struct ScLoadedNamespaceEntry
 
 class ScSheetSaveData
 {
-    std::unordered_set<OUString, OUStringHash>  maInitialPrefixes;
+    std::unordered_set<OUString>  maInitialPrefixes;
     std::vector<ScLoadedNamespaceEntry>              maLoadedNamespaces;
 
     std::vector<ScCellStyleEntry> maCellStyles;