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>

26 files changed, 98 insertions, 98 deletions

diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 0ff6868b9853..41382cd0116e 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -70,7 +70,7 @@ private:
     mutable bool            mbMatchData;    // true if matching attributes are initialized
     bool                    mbMapNames;     // true if MapNames are available
 
-    typedef std::unordered_map<OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies;
+    typedef std::unordered_map<OUString, PhysicalFontFamily*> PhysicalFontFamilies;
     PhysicalFontFamilies    maPhysicalFontFamilies;
 
     ImplPreMatchFontSubstitution* mpPreMatchHook;       // device specific prematch substitution
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index b37c0419a52f..9118664775e8 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -83,8 +83,8 @@ private:
     ImplImageTree(const ImplImageTree&) = delete;
     ImplImageTree& operator=(const ImplImageTree&) = delete;
 
-    typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
-    typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
+    typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>> IconCache;
+    typedef std::unordered_map<OUString, OUString> IconLinkHash;
 
     struct IconSet
     {
@@ -102,7 +102,7 @@ private:
     };
 
     /// Map between the theme name(s) and the content.
-    typedef std::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet;
+    typedef std::unordered_map<OUString, IconSet> StyleIconSet;
 
     /// Remember all the (used) icon styles and individual icons in them.
     StyleIconSet maIconSets;
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index db833018f905..35a706536b45 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -44,7 +44,7 @@ private:
     sal_uInt32      mnDriverDataLen;    //< length of system specific data
     sal_uInt8*      mpDriverData;       //< system specific data (will be streamed a byte block)
     bool            mbPapersizeFromSetup;
-    std::unordered_map< OUString, OUString, OUStringHash > maValueMap;
+    std::unordered_map< OUString, OUString > maValueMap;
 
 public:
     ImplJobSetup();
@@ -89,7 +89,7 @@ public:
     bool             GetPapersizeFromSetup() const { return mbPapersizeFromSetup; }
     void             SetPapersizeFromSetup(bool bPapersizeFromSetup);
 
-    const std::unordered_map< OUString, OUString, OUStringHash >& GetValueMap() const
+    const std::unordered_map< OUString, OUString >& GetValueMap() const
                     { return maValueMap; }
     void            SetValueMap(const OUString& rKey, const OUString& rValue);
 };
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index fabd07ae1a1e..9d6340cebf11 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -43,7 +43,7 @@ class VCL_PLUGIN_PUBLIC OpenGLProgram
 {
 private:
     GLuint          mnId;
-    std::unordered_map< OString, GLuint, OStringHash >
+    std::unordered_map< OString, GLuint >
                     maUniformLocations;
     sal_uInt32      mnEnabledAttribs;
     GLuint          mnPositionAttrib;
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index e53d03318083..3ea53ec2bdd9 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -42,7 +42,7 @@ struct ImplPrnQueueData
 class VCL_PLUGIN_PUBLIC ImplPrnQueueList
 {
 public:
-    std::unordered_map< OUString, sal_Int32, OUStringHash > m_aNameToIndex;
+    std::unordered_map< OUString, sal_Int32 > m_aNameToIndex;
     std::vector< ImplPrnQueueData >     m_aQueueInfos;
     std::vector< OUString >             m_aPrinterList;
 
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 315d7253ae8b..871565842db9 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -101,7 +101,7 @@ protected:
         PrinterInfo             m_aInfo;
     };
 
-    std::unordered_map< OUString, Printer, OUStringHash > m_aPrinters;
+    std::unordered_map< OUString, Printer > m_aPrinters;
     PrinterInfo                         m_aGlobalDefaults;
     std::vector< WatchFile >            m_aWatchFiles;
     OUString                     m_aDefaultPrinter;
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index dea353384f1b..6174449a38b5 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -71,8 +71,8 @@ class CPDManager : public PrinterInfoManager
     std::vector<std::pair<std::string, gchar*>> m_tBackends;
     std::unordered_map< std::string, GDBusProxy * > m_pBackends;
     std::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles;
-    std::unordered_map< OUString, CPDPrinter *, OUStringHash > m_aCPDDestMap;
-    std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
+    std::unordered_map< OUString, CPDPrinter * > m_aCPDDestMap;
+    std::unordered_map< OUString, PPDContext > m_aDefaultContexts;
 #endif
     CPDManager();
     // Function called when CPDManager is destroyed
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index f0dd91171ae2..f32b84256044 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -42,9 +42,9 @@ class CUPSManager : public PrinterInfoManager
     int                                                    m_nDests;
     void*                                                  m_pDests;
     bool                                                   m_bNewDests;
-    std::unordered_map< OUString, int, OUStringHash >      m_aCUPSDestMap;
+    std::unordered_map< OUString, int >      m_aCUPSDestMap;
 
-    std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
+    std::unordered_map< OUString, PPDContext > m_aDefaultContexts;
 
     OString                                                m_aUser;
     /** this is a security risk, but the CUPS API demands
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 43170bb7108d..1597dca79ed0 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -138,10 +138,10 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     fontID                                      m_nNextFontID;
     std::unordered_map< fontID, PrintFont* >    m_aFonts;
     // for speeding up findFontFileID
-    std::unordered_map< OString, std::set< fontID >, OStringHash >
+    std::unordered_map< OString, std::set< fontID > >
                                                 m_aFontFileToFontID;
 
-    std::unordered_map< OString, int, OStringHash >
+    std::unordered_map< OString, int >
     m_aDirToAtom;
     std::unordered_map< int, OString >          m_aAtomToDir;
     int                                         m_nNextDirAtom;
@@ -178,7 +178,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     called from <code>initialize()</code>
     */
     static void initFontconfig();
-    void countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
+    void countFontconfigFonts( std::unordered_map<OString, int>& o_rVisitedPaths );
     /* deinitialize fontconfig
      */
     static void deinitFontconfig();
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 2596d13436c5..d98d1895cc43 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -118,7 +118,7 @@ private:
 
 private:
   css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
-  typedef std::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes;
+  typedef std::unordered_map< OUString, NSString* > OfficeOnlyTypes;
   mutable OfficeOnlyTypes maOfficeOnlyTypes;
 };
 
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index fe9c69c1c7a0..25ec2cd50c74 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -57,7 +57,7 @@ SettingsConfigItem::~SettingsConfigItem()
 
 void SettingsConfigItem::ImplCommit()
 {
-    std::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group;
+    std::unordered_map< OUString, SmallOUStrMap >::const_iterator group;
 
     for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
     {
@@ -122,7 +122,7 @@ void SettingsConfigItem::getValues()
 
 OUString SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
 {
-    std::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
+    std::unordered_map< OUString, SmallOUStrMap >::const_iterator group = m_aSettings.find( rGroup );
     if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
     {
         return OUString();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index dfe238e47fb5..cc8712a48615 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -355,8 +355,8 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
             rOStream.WriteBytes( &aOldJobData, nOldJobDataSize );
             rOStream.WriteBytes( rJobData.GetDriverData(), rJobData.GetDriverDataLen() );
 
-            std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
-            const std::unordered_map< OUString, OUString, OUStringHash >& rValueMap(
+            std::unordered_map< OUString, OUString >::const_iterator it;
+            const std::unordered_map< OUString, OUString >& rValueMap(
                 rJobData.GetValueMap());
 
             for( it = rValueMap.begin(); it != rValueMap.end(); ++it )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index fbf9fa996c3e..16549094c6f0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -713,7 +713,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
             // find or create a hierarchical field
             // first find the fully qualified name up to this field
             aDomain = aFullName.copy( 0, nTokenIndex-1 );
-            std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+            std::unordered_map< OString, sal_Int32 >::const_iterator it = m_aFieldNameMap.find( aDomain );
             if( it == m_aFieldNameMap.end() )
             {
                  // create new hierarchy field
@@ -774,7 +774,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
     // insert widget into its hierarchy field
     if( !aDomain.isEmpty() )
     {
-        std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+        std::unordered_map< OString, sal_Int32 >::const_iterator it = m_aFieldNameMap.find( aDomain );
         if( it != m_aFieldNameMap.end() )
         {
             OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" );
@@ -801,11 +801,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
 
     if( ! m_aContext.AllowDuplicateFieldNames )
     {
-        std::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName );
+        std::unordered_map<OString, sal_Int32>::iterator it = m_aFieldNameMap.find( aFullName );
 
         if( it != m_aFieldNameMap.end() ) // not unique
         {
-            std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it;
+            std::unordered_map< OString, sal_Int32 >::const_iterator check_it;
             OString aTry;
             sal_Int32 nTry = 2;
             do
@@ -2645,7 +2645,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle )
         if( ! m_aRoleMap.empty() )
         {
             aLine.append( "/RoleMap<<" );
-            for( std::unordered_map<OString,OString,OStringHash>::const_iterator
+            for( std::unordered_map<OString,OString>::const_iterator
                  it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it )
             {
                 aLine.append( '/' );
@@ -11422,7 +11422,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
     {
         PDFWidget& rGroupWidget = m_aWidgets[ group->second ];
         // check whether all kids have a unique OnValue
-        std::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues;
+        std::unordered_map< OUString, sal_Int32 > aOnValues;
         int nChildren = rGroupWidget.m_aKidsIndex.size();
         bool bIsUnique = true;
         for( int nKid = 0; nKid < nChildren && bIsUnique; nKid++ )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 7b8fc46a3cb3..f4e764879137 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -468,8 +468,8 @@ public:
         {}
     };
 
-    typedef std::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams;
-    typedef std::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap;
+    typedef std::unordered_map< OString, SvMemoryStream* > PDFAppearanceStreams;
+    typedef std::unordered_map< OString, PDFAppearanceStreams > PDFAppearanceMap;
 
     struct PDFWidget : public PDFAnnotation
     {
@@ -680,7 +680,7 @@ private:
      */
     bool                                m_bEmitStructure;
     /* role map of struct tree root */
-    std::unordered_map< OString, OString, OStringHash >
+    std::unordered_map< OString, OString >
                                         m_aRoleMap;
 
     /* contains all widgets used in the PDF
@@ -689,7 +689,7 @@ private:
     /* maps radio group id to index of radio group control in m_aWidgets */
     std::map< sal_Int32, sal_Int32 >    m_aRadioGroupWidgets;
     /* unordered_map for field names, used to ensure unique field names */
-    std::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap;
+    std::unordered_map< OString, sal_Int32 > m_aFieldNameMap;
 
     /* contains Bitmaps for gradient functions until they are written
      *  to the file stream */
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 515b12de1d4a..98410f9a764e 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -374,7 +374,7 @@ ImplPrnQueueList::~ImplPrnQueueList()
 
 void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
 {
-    std::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it =
+    std::unordered_map< OUString, sal_Int32 >::iterator it =
         m_aNameToIndex.find( pData->maPrinterName );
     if( it == m_aNameToIndex.end() )
     {
@@ -397,7 +397,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
 ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter )
 {
     ImplPrnQueueData* pData = nullptr;
-    std::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it =
+    std::unordered_map<OUString,sal_Int32>::iterator it =
         m_aNameToIndex.find( rPrinter );
     if( it != m_aNameToIndex.end() )
         pData = &m_aQueueInfos[it->second];
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a825d0b23438..f41ae699ca03 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -135,9 +135,9 @@ public:
         ControlDependency() : mnDependsOnEntry( -1 ) {}
     };
 
-    typedef std::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap;
-    typedef std::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap;
-    typedef std::unordered_map< OUString, css::uno::Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap;
+    typedef std::unordered_map< OUString, size_t > PropertyToIndexMap;
+    typedef std::unordered_map< OUString, ControlDependency > ControlDependencyMap;
+    typedef std::unordered_map< OUString, css::uno::Sequence< sal_Bool > > ChoiceDisableMap;
 
     VclPtr< Printer >                                           mxPrinter;
     css::uno::Sequence< css::beans::PropertyValue >             maUIOptions;
@@ -1373,7 +1373,7 @@ bool PrinterController::getPrinterModified() const
 
 css::uno::Sequence< css::beans::PropertyValue > PrinterController::getJobProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rMergeList ) const
 {
-    std::unordered_set< OUString, OUStringHash > aMergeSet;
+    std::unordered_set< OUString > aMergeSet;
     size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3;
     for( int i = 0; i < i_rMergeList.getLength(); i++ )
         aMergeSet.insert( i_rMergeList[i].Name );
@@ -1422,14 +1422,14 @@ const css::uno::Sequence< css::beans::PropertyValue >& PrinterController::getUIO
 
 css::beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty )
 {
-    std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+    std::unordered_map< OUString, size_t >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rProperty );
     return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : nullptr;
 }
 
 const css::beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const
 {
-    std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+    std::unordered_map< OUString, size_t >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rProperty );
     return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : nullptr;
 }
@@ -1445,7 +1445,7 @@ void PrinterController::setValue( const OUString& i_rPropertyName, const css::un
 
 void PrinterController::setValue( const css::beans::PropertyValue& i_rPropertyValue )
 {
-    std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+    std::unordered_map< OUString, size_t >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rPropertyValue.Name );
     if( it != mpImplData->maPropertyToIndex.end() )
         mpImplData->maUIProperties[ it->second ] = i_rPropertyValue;
@@ -1525,7 +1525,7 @@ void PrinterController::setUIOptions( const css::uno::Sequence< css::beans::Prop
 bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const
 {
     bool bEnabled = false;
-    std::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it =
+    std::unordered_map< OUString, size_t >::const_iterator prop_it =
         mpImplData->maPropertyToIndex.find( i_rProperty );
     if( prop_it != mpImplData->maPropertyToIndex.end() )
     {
@@ -1755,7 +1755,7 @@ sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_In
 css::uno::Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const
 {
     css::uno::Any aRet;
-    std::unordered_map< OUString, css::uno::Any, OUStringHash >::const_iterator it =
+    std::unordered_map< OUString, css::uno::Any >::const_iterator it =
         m_aPropertyMap.find( i_rPropertyName );
     if( it != m_aPropertyMap.end() )
         aRet = it->second;
@@ -1792,7 +1792,7 @@ bool PrinterOptionsHelper::processProperties( const css::uno::Sequence< css::bea
     for( sal_Int32 i = 0; i < nElements; i++ )
     {
         bool bElementChanged = false;
-        std::unordered_map< OUString, css::uno::Any, OUStringHash >::iterator it =
+        std::unordered_map< OUString, css::uno::Any >::iterator it =
             m_aPropertyMap.find( pVals[ i ].Name );
         if( it != m_aPropertyMap.end() )
         {
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 146d810b632d..5d1b64b74fdd 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -89,7 +89,7 @@ OString loadShader(const OUString& rFilename)
 
 OString& getShaderSource(const OUString& rFilename)
 {
-    static std::unordered_map<OUString, OString, OUStringHash> aMap;
+    static std::unordered_map<OUString, OString> aMap;
 
     if (aMap.find(rFilename) == aMap.end())
     {
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index cbda1d98e6b7..9aef71b08a1d 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -201,9 +201,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
     return aEncoding;
 }
 
-std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances()
+std::unordered_map< OUString, SelectionManager* >& SelectionManager::getInstances()
 {
-    static std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances;
+    static std::unordered_map< OUString, SelectionManager* > aInstances;
     return aInstances;
 }
 
@@ -455,7 +455,7 @@ SelectionManager::~SelectionManager()
     {
         osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() );
 
-        std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it;
+        std::unordered_map< OUString, SelectionManager* >::iterator it;
         for( it = getInstances().begin(); it != getInstances().end(); ++it )
             if( it->second == this )
             {
@@ -671,7 +671,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName )
         aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 );
     SelectionManager* pInstance = nullptr;
 
-    std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName );
+    std::unordered_map< OUString, SelectionManager* >::iterator it = getInstances().find( aDisplayName );
     if( it != getInstances().end() )
         pInstance = it->second;
     else pInstance = getInstances()[ aDisplayName ] = new SelectionManager();
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 12d57a47b378..e6910f330a33 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -151,7 +151,7 @@ namespace x11 {
         >,
         public SelectionAdaptor
     {
-        static std::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances();
+        static std::unordered_map< OUString, SelectionManager* >& getInstances();
 
         // for INCR type selection transfer
         // INCR protocol is used if the data cannot
@@ -345,7 +345,7 @@ namespace x11 {
         // caching for atoms
         std::unordered_map< Atom, OUString >
                                     m_aAtomToString;
-        std::unordered_map< OUString, Atom, OUStringHash >
+        std::unordered_map< OUString, Atom >
                                     m_aStringToAtom;
 
         // the registered selections
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 34b9ba27f642..cfdb53ba9a94 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -86,8 +86,8 @@ public:
     FcResult LocalizedElementFromPattern(FcPattern const * pPattern, FcChar8 **family,
                                          const char *elementtype, const char *elementlangtype);
 //to-do, make private and add some cleaner accessor methods
-    std::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized;
-    std::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical;
+    std::unordered_map< OString, OString > m_aFontNameToLocalized;
+    std::unordered_map< OString, OString > m_aLocalizedToCanonical;
 private:
     void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements);
 
@@ -474,7 +474,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
     memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*));
 }
 
-void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths )
+void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int>& o_rVisitedPaths )
 {
 #if OSL_DEBUG_LEVEL > 1
     int nFonts = 0;
@@ -1057,7 +1057,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
                 if( eFamilyRes == FcResultMatch )
                 {
                     OString sFamily(reinterpret_cast<char*>(family));
-                    std::unordered_map< OString, OString, OStringHash >::const_iterator aI =
+                    std::unordered_map< OString, OString >::const_iterator aI =
                         rWrapper.m_aFontNameToLocalized.find(sFamily);
                     if (aI != rWrapper.m_aFontNameToLocalized.end())
                         sFamily = aI->second;
@@ -1177,7 +1177,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions(const FastPrintFontInfo&
 
     OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
 
-    std::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
+    std::unordered_map< OString, OString >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
     if (aI != rWrapper.m_aLocalizedToCanonical.end())
         sFamily = aI->second;
     if( !sFamily.isEmpty() )
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index dd0cfb7dc42a..0962ce6366a3 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -169,7 +169,7 @@ OString PrintFontManager::getDirectory( int nAtom ) const
 int PrintFontManager::getDirectoryAtom( const OString& rDirectory )
 {
     int nAtom = 0;
-    std::unordered_map< OString, int, OStringHash >::const_iterator it
+    std::unordered_map< OString, int >::const_iterator it
           ( m_aDirToAtom.find( rDirectory ) );
     if( it != m_aDirToAtom.end() )
         nAtom = it->second;
@@ -312,7 +312,7 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, i
 {
     fontID nID = 0;
 
-    std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile );
+    std::unordered_map< OString, ::std::set< fontID > >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile );
     if( set_it == m_aFontFileToFontID.end() )
         return nID;
 
@@ -334,7 +334,7 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString
 {
     std::vector<fontID> aIds;
 
-    std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile );
+    std::unordered_map< OString, ::std::set< fontID > >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile );
     if( set_it == m_aFontFileToFontID.end() )
         return aIds;
 
@@ -754,7 +754,7 @@ void PrintFontManager::initialize()
     }
 
     // protect against duplicate paths
-    std::unordered_map< OString, int, OStringHash > visited_dirs;
+    std::unordered_map< OString, int > visited_dirs;
 
     // Don't search directories that fontconfig already did
     countFontconfigFonts( visited_dirs );
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx
index 7c932a410bba..5764e2d14444 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -154,13 +154,13 @@ void CPDManager::printerRemoved (GDBusConnection *,
     uniqueName << id << ", " << backend_name;
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     OUString aUniqueName = OStringToOUString( uniqueName.str().c_str(), aEncoding );
-    std::unordered_map<OUString, CPDPrinter *, OUStringHash>::iterator it = pManager->m_aCPDDestMap.find( aUniqueName );
+    std::unordered_map<OUString, CPDPrinter *>::iterator it = pManager->m_aCPDDestMap.find( aUniqueName );
     if (it == pManager->m_aCPDDestMap.end()) {
         SAL_WARN("vcl.unx.print", "CPD trying to remove non-existent printer from list");
         return;
     }
     pManager->m_aCPDDestMap.erase(it);
-    std::unordered_map<OUString, Printer, OUStringHash>::iterator printersIt = pManager->m_aPrinters.find( aUniqueName );
+    std::unordered_map<OUString, Printer>::iterator printersIt = pManager->m_aPrinters.find( aUniqueName );
     if (printersIt == pManager->m_aPrinters.end()) {
         SAL_WARN("vcl.unx.print", "CPD trying to remove non-existent printer from m_aPrinters");
         return;
@@ -190,7 +190,7 @@ std::vector<std::pair<std::string, gchar*>> CPDManager::getTempBackends() {
 
 void CPDManager::addNewPrinter(const OUString& aPrinterName, const OUString& aUniqueName, CPDPrinter *pDest) {
     std::pair<OUString, CPDPrinter *> newPrinter (aUniqueName, pDest);
-    std::unordered_map<OUString, CPDPrinter *, OUStringHash>::iterator it = m_aCPDDestMap.find( aUniqueName );
+    std::unordered_map<OUString, CPDPrinter *>::iterator it = m_aCPDDestMap.find( aUniqueName );
     if (it == m_aCPDDestMap.end()) {
         m_aCPDDestMap.insert(newPrinter);
     } else {
@@ -223,7 +223,7 @@ void CPDManager::addNewPrinter(const OUString& aPrinterName, const OUString& aUn
     // behaviour
     aPrinter.m_aInfo.m_pParser = nullptr;
     aPrinter.m_aInfo.m_aContext.setParser( nullptr );
-    std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aUniqueName );
+    std::unordered_map< OUString, PPDContext >::const_iterator c_it = m_aDefaultContexts.find( aUniqueName );
     if( c_it != m_aDefaultContexts.end() )
     {
         aPrinter.m_aInfo.m_pParser = c_it->second.getParser();
@@ -301,7 +301,7 @@ CPDManager::~CPDManager()
     {
         g_object_unref(it->second);
     }
-    std::unordered_map<OUString, CPDPrinter *, OUStringHash>::iterator dest_it =
+    std::unordered_map<OUString, CPDPrinter *>::iterator dest_it =
         m_aCPDDestMap.begin();
     for(; dest_it != m_aCPDDestMap.end(); ++dest_it)
     {
@@ -322,7 +322,7 @@ const PPDParser* CPDManager::createCPDParser( const OUString& rPrinter )
     else
         aPrinter = rPrinter;
 
-    std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator dest_it =
+    std::unordered_map< OUString, CPDPrinter * >::iterator dest_it =
         m_aCPDDestMap.find( aPrinter );
 
     if( dest_it != m_aCPDDestMap.end() )
@@ -517,7 +517,7 @@ void CPDManager::initialize()
 
     // remove everything that is not a CUPS printer and not
     // a special purpose printer (PDF, Fax)
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
+    std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.begin();
     while (it != m_aPrinters.end())
     {
         if( m_aCPDDestMap.find( it->first ) != m_aCPDDestMap.end() )
@@ -539,13 +539,13 @@ void CPDManager::initialize()
 void CPDManager::setupJobContextData( JobData& rData )
 {
 #if ENABLE_DBUS && ENABLE_GIO
-    std::unordered_map<OUString, CPDPrinter *, OUStringHash>::iterator dest_it =
+    std::unordered_map<OUString, CPDPrinter *>::iterator dest_it =
         m_aCPDDestMap.find( rData.m_aPrinterName );
 
     if( dest_it == m_aCPDDestMap.end() )
         return PrinterInfoManager::setupJobContextData( rData );
 
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
+    std::unordered_map< OUString, Printer >::iterator p_it =
         m_aPrinters.find( rData.m_aPrinterName );
     if( p_it == m_aPrinters.end() ) // huh ?
     {
@@ -681,7 +681,7 @@ bool CPDManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
     bool success = false;
 #if ENABLE_DBUS && ENABLE_GIO
     SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
-    std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator dest_it =
+    std::unordered_map< OUString, CPDPrinter * >::iterator dest_it =
         m_aCPDDestMap.find( rPrintername );
     if( dest_it == m_aCPDDestMap.end() )
     {
@@ -777,7 +777,7 @@ bool CPDManager::setDefaultPrinter( const OUString& rName )
 {
     bool bSuccess = false;
 #if ENABLE_DBUS && ENABLE_GIO
-    std::unordered_map< OUString, CPDPrinter *, OUStringHash >::iterator nit =
+    std::unordered_map< OUString, CPDPrinter * >::iterator nit =
         m_aCPDDestMap.find( rName );
     if( nit != m_aCPDDestMap.end())
     {
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index d96a85c4a38d..480aa2832609 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -333,7 +333,7 @@ void CUPSManager::initialize()
         // behaviour
         aPrinter.m_aInfo.m_pParser = nullptr;
         aPrinter.m_aInfo.m_aContext.setParser( nullptr );
-        std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
+        std::unordered_map< OUString, PPDContext >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
         if( c_it != m_aDefaultContexts.end() )
         {
             aPrinter.m_aInfo.m_pParser = c_it->second.getParser();
@@ -350,7 +350,7 @@ void CUPSManager::initialize()
     // remove everything that is not a CUPS printer and not
     // a special purpose printer (PDF, Fax)
     std::list< OUString > aRemovePrinters;
-    for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
+    for( std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.begin();
          it != m_aPrinters.end(); ++it )
     {
         if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() )
@@ -425,7 +425,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
     {
         if (m_nDests && m_pDests)
         {
-            std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+            std::unordered_map< OUString, int >::iterator dest_it =
             m_aCUPSDestMap.find( aPrinter );
             if( dest_it != m_aCUPSDestMap.end() )
             {
@@ -504,13 +504,13 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
 
 void CUPSManager::setupJobContextData( JobData& rData )
 {
-    std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+    std::unordered_map< OUString, int >::iterator dest_it =
         m_aCUPSDestMap.find( rData.m_aPrinterName );
 
     if( dest_it == m_aCUPSDestMap.end() )
         return PrinterInfoManager::setupJobContextData( rData );
 
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
+    std::unordered_map< OUString, Printer >::iterator p_it =
         m_aPrinters.find( rData.m_aPrinterName );
     if( p_it == m_aPrinters.end() ) // huh ?
     {
@@ -625,7 +625,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
 
     osl::MutexGuard aGuard( m_aCUPSMutex );
 
-    std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+    std::unordered_map< OUString, int >::iterator dest_it =
         m_aCUPSDestMap.find( rPrintername );
     if( dest_it == m_aCUPSDestMap.end() )
     {
@@ -753,7 +753,7 @@ bool CUPSManager::removePrinter( const OUString& rName, bool bCheck )
 bool CUPSManager::setDefaultPrinter( const OUString& rName )
 {
     bool bSuccess = false;
-    std::unordered_map< OUString, int, OUStringHash >::iterator nit =
+    std::unordered_map< OUString, int >::iterator nit =
         m_aCUPSDestMap.find( rName );
     if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() )
     {
@@ -777,10 +777,10 @@ bool CUPSManager::writePrinterConfig()
     bool bDestModified = false;
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
-    for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt =
+    for( std::unordered_map< OUString, Printer >::iterator prt =
              m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt )
     {
-        std::unordered_map< OUString, int, OUStringHash >::iterator nit =
+        std::unordered_map< OUString, int >::iterator nit =
             m_aCUPSDestMap.find( prt->first );
         if( nit == m_aCUPSDestMap.end() )
             continue;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 292010dfec8c..40ffdfeb44c4 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -80,7 +80,7 @@ namespace psp
         };
 
         typedef std::unordered_map< css::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
-        typedef std::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
+        typedef std::unordered_map< OUString, translation_map > key_translation_map;
 
         key_translation_map     m_aTranslations;
         public:
@@ -240,7 +240,7 @@ namespace psp
     {
     public:
         std::vector< std::unique_ptr<PPDParser> > aAllParsers;
-        std::unique_ptr<std::unordered_map< OUString, OUString, OUStringHash >> pAllPPDFiles;
+        std::unique_ptr<std::unordered_map< OUString, OUString >> pAllPPDFiles;
         PPDCache()
             : pAllPPDFiles(nullptr)
         {}
@@ -440,7 +440,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache)
     if( rPPDCache.pAllPPDFiles )
         return;
 
-    rPPDCache.pAllPPDFiles.reset(new std::unordered_map< OUString, OUString, OUStringHash >);
+    rPPDCache.pAllPPDFiles.reset(new std::unordered_map< OUString, OUString >);
 
     // check installation directories
     std::vector< OUString > aPathList;
@@ -475,7 +475,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile )
     PPDDecompressStream aStream( aPPD.PathToFileName() );
     if( ! aStream.IsOpen() )
     {
-        std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
+        std::unordered_map< OUString, OUString >::const_iterator it;
         PPDCache &rPPDCache = thePPDCache::get();
 
         bool bRetry = true;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 9b8274069fd3..cdd5580b7452 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -458,7 +458,7 @@ void PrinterInfoManager::initialize()
                 FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile );
                 aPrinter.m_bModified    = false;
                 aPrinter.m_aGroup       = aConfig.GetGroupName( nGroup );
-                std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it =
+                std::unordered_map< OUString, Printer >::const_iterator find_it =
                 m_aPrinters.find( aPrinterName );
                 if( find_it != m_aPrinters.end() )
                 {
@@ -537,7 +537,7 @@ void PrinterInfoManager::initialize()
 
 void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) const
 {
-    std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it;
+    std::unordered_map< OUString, Printer >::const_iterator it;
     rVector.clear();
     for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
         rVector.push_back( it->first );
@@ -546,7 +546,7 @@ void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) cons
 const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
 {
     static PrinterInfo aEmptyInfo;
-    std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
+    std::unordered_map< OUString, Printer >::const_iterator it = m_aPrinters.find( rPrinter );
 
     SAL_WARN_IF( it == m_aPrinters.end(), "vcl", "Do not ask for info about nonexistent printers" );
 
@@ -568,9 +568,9 @@ static bool checkWriteability( const OUString& rUniPath )
 bool PrinterInfoManager::writePrinterConfig()
 {
     // find at least one writeable config
-    std::unordered_map< OUString, Config*, OUStringHash > files;
-    std::unordered_map< OUString, int, OUStringHash > rofiles;
-    std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it;
+    std::unordered_map< OUString, Config* > files;
+    std::unordered_map< OUString, int > rofiles;
+    std::unordered_map< OUString, Config* >::iterator file_it;
 
     for( ::std::vector< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit )
     {
@@ -587,7 +587,7 @@ bool PrinterInfoManager::writePrinterConfig()
     Config* pGlobal = files.begin()->second;
     pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP );
 
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator it;
+    std::unordered_map< OUString, Printer >::iterator it;
     for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
     {
         if( ! it->second.m_bModified )
@@ -757,7 +757,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
 {
     bool bSuccess = true;
 
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+    std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.find( rPrinterName );
     if( it != m_aPrinters.end() )
     {
         if( !it->second.m_aFile.isEmpty() )
@@ -809,7 +809,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
 {
     bool bSuccess = false;
 
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+    std::unordered_map< OUString, Printer >::iterator it = m_aPrinters.find( rPrinterName );
     if( it != m_aPrinters.end() )
     {
         bSuccess = true;
@@ -855,7 +855,7 @@ bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStr
 
 void PrinterInfoManager::setupJobContextData( JobData& rData )
 {
-    std::unordered_map< OUString, Printer, OUStringHash >::iterator it =
+    std::unordered_map< OUString, Printer >::iterator it =
     m_aPrinters.find( rData.m_aPrinterName );
     if( it != m_aPrinters.end() )
     {
@@ -967,8 +967,8 @@ static void lpgetSysQueueTokenHandler(
     const SystemCommandParameters* )
 {
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-    std::unordered_set< OUString, OUStringHash > aUniqueSet;
-    std::unordered_set< OUString, OUStringHash > aOnlySet;
+    std::unordered_set< OUString > aUniqueSet;
+    std::unordered_set< OUString > aOnlySet;
     aUniqueSet.insert( OUString( "_all" ) );
     aUniqueSet.insert( OUString( "_default" ) );
 
@@ -1064,7 +1064,7 @@ static void standardSysQueueTokenHandler(
     const SystemCommandParameters* i_pParms)
 {
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-    std::unordered_set< OUString, OUStringHash > aUniqueSet;
+    std::unordered_set< OUString > aUniqueSet;
     OString aForeToken( i_pParms->pForeToken );
     OString aAftToken( i_pParms->pAftToken );
     /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 52398b3b13f1..3aa33ef08f57 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -102,7 +102,7 @@ bool WinSalSystem::initMonitors()
         DISPLAY_DEVICEW aDev;
         aDev.cb = sizeof( aDev );
         DWORD nDevice = 0;
-        std::unordered_map< OUString, int, OUStringHash > aDeviceStringCount;
+        std::unordered_map< OUString, int > aDeviceStringCount;
         while( EnumDisplayDevicesW( nullptr, nDevice++, &aDev, 0 ) )
         {
             if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
@@ -125,7 +125,7 @@ bool WinSalSystem::initMonitors()
         EnumDisplayMonitors( aDesktopRC, nullptr, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) );
 
         // append monitor numbers to name strings
-        std::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount );
+        std::unordered_map< OUString, int > aDevCount( aDeviceStringCount );
         unsigned int nMonitorCount = m_aMonitors.size();
         for( unsigned int i = 0; i < nMonitorCount; i++ )
         {