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>

9 files changed, 9 insertions, 15 deletions

diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 591f8524b8d5..24fd8c37e160 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -81,7 +81,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
     private:
         osl::Mutex m_mutex;
 
-        std::unordered_map<OUString, sal_Int32, OUStringHash> m_aRequestContainer;
+        std::unordered_map<OUString, sal_Int32> m_aRequestContainer;
 
         sal_Int16                   m_nRequestCount;
 };
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index 3b172ff713a3..fb59cd5a0680 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -28,7 +28,7 @@ namespace dp_misc
 {
 
 typedef std::unordered_map<
-    OString, OString, OStringHash > t_string2string_map;
+    OString, OString > t_string2string_map;
 
 // Class to read obsolete registered extensions
 // should be removed for LibreOffice 4.0
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index e797fb1855e9..a2dd6bbbad30 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -38,8 +38,7 @@ namespace dp_manager {
 
 typedef std::unordered_map<
     OUString,
-    std::vector<css::uno::Reference<css::deployment::XPackage> >,
-    OUStringHash > id2extensions;
+    std::vector<css::uno::Reference<css::deployment::XPackage> > > id2extensions;
 
 class ExtensionManager : private ::dp_misc::MutexHolder,
         public ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager >
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 1a58b9122f80..37089fc239ba 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -47,8 +47,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
     Reference<deployment::XPackageManager> m_xTmpMgr;
     Reference<deployment::XPackageManager> m_xBakMgr;
     typedef std::unordered_map<
-        OUString, WeakReference<deployment::XPackageManager>,
-        OUStringHash > t_string2weakref;
+        OUString, WeakReference<deployment::XPackageManager> > t_string2weakref;
     t_string2weakref m_managers;
 
 protected:
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index bfac300cd95e..593815eac108 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -265,8 +265,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     bool m_unorc_modified;
     bool bSwitchedRdbFiles;
 
-    typedef std::unordered_map< OUString, Reference<XInterface>,
-                                OUStringHash > t_string2object;
+    typedef std::unordered_map< OUString, Reference<XInterface> > t_string2object;
     t_string2object m_backendObjects;
 
     // PackageRegistryBackend
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 08859be1a91b..b3bad4b7fc0c 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -182,7 +182,7 @@ void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
     m_allBackends.insert( xBackend );
-    typedef std::unordered_set<OUString, OUStringHash> t_stringset;
+    typedef std::unordered_set<OUString> t_stringset;
     t_stringset ambiguousFilters;
 
     const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes(
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index fc35cd592bf2..e201461c2bfc 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -75,8 +75,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     };
     friend class ExecutablePackageImpl;
 
-    typedef std::unordered_map< OUString, Reference<XInterface>,
-                                OUStringHash > t_string2object;
+    typedef std::unordered_map< OUString, Reference<XInterface> > t_string2object;
 
     // PackageRegistryBackend
     virtual Reference<deployment::XPackage> bindPackage_(
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 6aebe1124026..2115204c17b0 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -208,8 +208,7 @@ class PackageRegistryBackend
     //of bindPackage calls which are costly. Therefore we keep hard references in
     //the map now.
     typedef std::unordered_map<
-        OUString, css::uno::Reference<css::deployment::XPackage>,
-        OUStringHash > t_string2ref;
+        OUString, css::uno::Reference<css::deployment::XPackage> > t_string2ref;
     t_string2ref m_bound;
 
 protected:
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 7da83d96396f..a15421ee6ad7 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -120,8 +120,7 @@ struct MigrationItem
     }
 };
 
-typedef std::unordered_map< OUString, std::vector< MigrationItem >,
-                            OUStringHash > MigrationHashMap;
+typedef std::unordered_map< OUString, std::vector< MigrationItem > > MigrationHashMap;
 
 /**
     information for the UI elements to be migrated for one module