[Libreoffice-commits] core.git: 2 commits - accessibility/inc basic/source bridges/inc bridges/source comphelper/source connectivity/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source framework/inc framework/source i18nlangtag/source i18npool/inc idlc/inc idlc/source idl/inc include/basic include/codemaker include/comphelper include/formula include/rtl include/sfx2 include/svl include/svtools include/svx include/toolkit include/tools include/unotools include/vbahelper include/vcl include/xmloff include/xmlreader l10ntools/inc linguistic/source oox/source package/inc package/source pyuno/source registry/source reportdesign/source sal/rtl sax/source sc/inc scripting/source sc/source sdext/source sd/inc sd/source sfx2/source starmath/source stoc/source svgio/inc svgio/source svl/source svtools/source svx/source sw/inc sw/source toolkit/source ucbhelper/source ucb/source unotools/source unoxml/inc uui/source vbahe lper/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win writerfilter/source writerperfect/qa writerperfect/source xmlhelp/source xmloff/source xmlscript/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Oct 23 06:16:04 UTC 2017


 accessibility/inc/extended/textwindowaccessibility.hxx                      |    3 -
 basic/source/classes/sb.cxx                                                 |    3 -
 basic/source/classes/sbunoobj.cxx                                           |    2 
 basic/source/inc/namecont.hxx                                               |    2 
 basic/source/inc/sbunoobj.hxx                                               |    2 
 basic/source/inc/scriptcont.hxx                                             |    4 -
 bridges/inc/vtablefactory.hxx                                               |    2 
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx                          |    2 
 bridges/source/cpp_uno/gcc3_ios/except.cxx                                  |    2 
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx                          |    2 
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx                            |    2 
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx                          |    2 
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx                         |    2 
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx                        |    2 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx                      |    2 
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx                          |    2 
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx                          |    2 
 bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx                        |    2 
 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx                        |    2 
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx                        |    2 
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx                        |    2 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx                          |    2 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx                         |    2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx                             |    2 
 bridges/source/jni_uno/jni_info.h                                           |    2 
 comphelper/source/container/embeddedobjectcontainer.cxx                     |    2 
 comphelper/source/misc/namedvaluecollection.cxx                             |    2 
 comphelper/source/property/propagg.cxx                                      |    2 
 connectivity/source/drivers/mork/MColumnAlias.hxx                           |    2 
 connectivity/source/drivers/mork/MQueryHelper.hxx                           |    2 
 connectivity/source/drivers/postgresql/pq_statics.hxx                       |    3 -
 connectivity/source/drivers/postgresql/pq_tools.hxx                         |    6 --
 connectivity/source/drivers/postgresql/pq_xcontainer.hxx                    |    3 -
 cppu/source/uno/lbenv.cxx                                                   |    5 -
 cppu/source/uno/lbmap.cxx                                                   |    3 -
 cppuhelper/source/component_context.cxx                                     |    3 -
 cppuhelper/source/factory.cxx                                               |    4 -
 cppuhelper/source/servicemanager.hxx                                        |    2 
 cui/source/customize/cfg.cxx                                                |    8 +--
 cui/source/inc/macropg.hxx                                                  |    3 -
 cui/source/inc/scriptdlg.hxx                                                |    3 -
 dbaccess/source/core/recovery/subcomponents.hxx                             |    2 
 desktop/source/app/dispatchwatcher.hxx                                      |    2 
 desktop/source/deployment/inc/dp_persmap.h                                  |    2 
 desktop/source/deployment/manager/dp_extensionmanager.hxx                   |    3 -
 desktop/source/deployment/manager/dp_managerfac.cxx                         |    3 -
 desktop/source/deployment/registry/component/dp_component.cxx               |    3 -
 desktop/source/deployment/registry/dp_registry.cxx                          |    2 
 desktop/source/deployment/registry/executable/dp_executable.cxx             |    3 -
 desktop/source/deployment/registry/inc/dp_backend.h                         |    3 -
 desktop/source/migration/migration_impl.hxx                                 |    3 -
 editeng/source/misc/svxacorr.cxx                                            |    2 
 extensions/source/bibliography/framectr.cxx                                 |    2 
 extensions/source/ole/oleobjw.hxx                                           |    4 -
 extensions/source/ole/unoobjw.hxx                                           |    6 --
 extensions/source/propctrlr/eventhandler.cxx                                |    2 
 extensions/source/propctrlr/eventhandler.hxx                                |    2 
 extensions/source/propctrlr/pcrcommontypes.hxx                              |    2 
 extensions/source/propctrlr/propcontroller.hxx                              |    6 +-
 filter/source/config/cache/cacheitem.hxx                                    |   10 +--
 filter/source/config/cache/querytokenizer.hxx                               |    4 -
 filter/source/svg/svgfilter.hxx                                             |    2 
 filter/source/svg/svgwriter.hxx                                             |    2 
 forms/source/component/Filter.hxx                                           |    2 
 forms/source/inc/InterfaceContainer.hxx                                     |    2 
 forms/source/inc/property.hxx                                               |    2 
 framework/inc/classes/protocolhandlercache.hxx                              |    4 -
 framework/inc/uiconfiguration/graphicnameaccess.hxx                         |    2 
 framework/inc/uiconfiguration/imagetype.hxx                                 |    6 --
 framework/inc/uielement/commandinfo.hxx                                     |    2 
 framework/inc/uielement/menubarmanager.hxx                                  |    2 
 framework/inc/uielement/toolbarmanager.hxx                                  |    2 
 framework/inc/uielement/uicommanddescription.hxx                            |    6 --
 framework/inc/uifactory/configurationaccessfactorymanager.hxx               |    4 -
 framework/inc/uifactory/factoryconfiguration.hxx                            |    3 -
 framework/inc/xml/imagesdocumenthandler.hxx                                 |    4 -
 framework/inc/xml/statusbardocumenthandler.hxx                              |    3 -
 framework/inc/xml/toolboxdocumenthandler.hxx                                |    3 -
 framework/source/dispatch/dispatchinformationprovider.cxx                   |    2 
 framework/source/fwe/classes/addonsoptions.cxx                              |    6 +-
 framework/source/inc/accelerators/acceleratorcache.hxx                      |    2 
 framework/source/inc/accelerators/keymapping.hxx                            |    2 
 framework/source/inc/accelerators/storageholder.hxx                         |    5 -
 framework/source/services/frame.cxx                                         |    2 
 framework/source/services/pathsettings.cxx                                  |    2 
 framework/source/services/substitutepathvars.cxx                            |    2 
 framework/source/uiconfiguration/CommandImageResolver.hxx                   |    2 
 framework/source/uiconfiguration/image.h                                    |    2 
 framework/source/uiconfiguration/imagemanagerimpl.hxx                       |    3 -
 framework/source/uiconfiguration/moduleuicfgsupplier.cxx                    |    2 
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx           |    4 -
 framework/source/uiconfiguration/uicategorydescription.cxx                  |    3 -
 framework/source/uiconfiguration/uiconfigurationmanager.cxx                 |    4 -
 framework/source/uiconfiguration/windowstateconfiguration.cxx               |    9 +--
 framework/source/uielement/controlmenucontroller.cxx                        |    3 -
 framework/source/uielement/toolbarsmenucontroller.cxx                       |    2 
 framework/source/uielement/uicommanddescription.cxx                         |    3 -
 i18nlangtag/source/languagetag/languagetag.cxx                              |    2 
 i18npool/inc/breakiterator_unicode.hxx                                      |    2 
 idl/inc/hash.hxx                                                            |    2 
 idlc/inc/astattribute.hxx                                                   |    4 -
 idlc/inc/astdeclaration.hxx                                                 |    4 -
 idlc/inc/astinterfacemember.hxx                                             |    2 
 idlc/inc/astscope.hxx                                                       |    4 -
 idlc/inc/astservicemember.hxx                                               |    2 
 idlc/inc/aststack.hxx                                                       |    2 
 idlc/inc/fehelper.hxx                                                       |    6 +-
 idlc/inc/idlc.hxx                                                           |   20 +++----
 idlc/inc/options.hxx                                                        |   10 +--
 idlc/source/astdump.cxx                                                     |    4 -
 idlc/source/astscope.cxx                                                    |    4 -
 idlc/source/fehelper.cxx                                                    |    2 
 idlc/source/options.cxx                                                     |    6 +-
 include/basic/codecompletecache.hxx                                         |    4 -
 include/codemaker/generatedtypeset.hxx                                      |    2 
 include/comphelper/PropertyInfoHash.hxx                                     |    6 --
 include/comphelper/sequenceashashmap.hxx                                    |    2 
 include/formula/FormulaCompiler.hxx                                         |    4 -
 include/rtl/string.hxx                                                      |   21 ++++++++
 include/rtl/ustring.hxx                                                     |   21 ++++++++
 include/sfx2/sidebar/Theme.hxx                                              |    2 
 include/svl/IndexedStyleSheets.hxx                                          |    2 
 include/svtools/framestatuslistener.hxx                                     |    3 -
 include/svtools/statusbarcontroller.hxx                                     |    3 -
 include/svtools/toolboxcontroller.hxx                                       |    3 -
 include/svx/ShapeTypeHandler.hxx                                            |    3 -
 include/svx/sdasitm.hxx                                                     |    2 
 include/toolkit/controls/eventcontainer.hxx                                 |    2 
 include/tools/inetmime.hxx                                                  |    2 
 include/unotools/fontcfg.hxx                                                |    6 +-
 include/vbahelper/vbaeventshelperbase.hxx                                   |    2 
 include/vcl/configsettings.hxx                                              |    4 -
 include/vcl/ppdparser.hxx                                                   |    4 -
 include/vcl/print.hxx                                                       |    2 
 include/xmloff/nmspmap.hxx                                                  |    2 
 include/xmloff/prstylei.hxx                                                 |    2 
 include/xmlreader/xmlreader.hxx                                             |    2 
 l10ntools/inc/cfgmerge.hxx                                                  |    2 
 l10ntools/inc/export.hxx                                                    |    6 +-
 l10ntools/inc/xmlparse.hxx                                                  |    6 +-
 linguistic/source/convdic.hxx                                               |    4 -
 oox/source/drawingml/customshapegeometry.cxx                                |    2 
 package/inc/HashMaps.hxx                                                    |   21 +-------
 package/source/manifest/ManifestImport.hxx                                  |    2 
 package/source/xstor/ohierarchyholder.hxx                                   |   12 ----
 pyuno/source/module/pyuno_impl.hxx                                          |    8 +--
 pyuno/source/module/pyuno_module.cxx                                        |    2 
 registry/source/regimpl.hxx                                                 |    2 
 reportdesign/source/core/sdr/UndoEnv.cxx                                    |    2 
 sal/rtl/bootstrap.cxx                                                       |    3 -
 sax/source/fastparser/fastparser.cxx                                        |    3 -
 sc/inc/addincol.hxx                                                         |    2 
 sc/inc/autonamecache.hxx                                                    |    2 
 sc/inc/chartlis.hxx                                                         |    2 
 sc/inc/dpcache.hxx                                                          |    2 
 sc/inc/dpgroup.hxx                                                          |    2 
 sc/inc/dpsave.hxx                                                           |   10 +--
 sc/inc/dptabres.hxx                                                         |    2 
 sc/inc/dptabsrc.hxx                                                         |    2 
 sc/inc/dptypes.hxx                                                          |    2 
 sc/inc/externalrefmgr.hxx                                                   |    6 +-
 sc/inc/formulaparserpool.hxx                                                |    3 -
 sc/inc/macromgr.hxx                                                         |    2 
 sc/inc/sheetdata.hxx                                                        |    2 
 sc/source/core/data/dpcache.cxx                                             |    2 
 sc/source/core/data/dpsave.cxx                                              |    8 +--
 sc/source/core/data/dptabres.cxx                                            |    2 
 sc/source/core/data/table3.cxx                                              |    2 
 sc/source/core/inc/cellkeytranslator.hxx                                    |    2 
 sc/source/core/tool/formulaparserpool.cxx                                   |    3 -
 sc/source/filter/excel/excimp8.cxx                                          |    2 
 sc/source/filter/excel/xepivotxml.cxx                                       |    2 
 sc/source/filter/inc/htmlpars.hxx                                           |    2 
 sc/source/filter/inc/orcusinterface.hxx                                     |    2 
 sc/source/filter/xml/editattributemap.hxx                                   |    2 
 sc/source/filter/xml/pivotsource.hxx                                        |    2 
 sc/source/filter/xml/xmldpimp.hxx                                           |    2 
 sc/source/ui/cctrl/checklistmenu.cxx                                        |    8 +--
 sc/source/ui/docshell/docsh6.cxx                                            |    2 
 sc/source/ui/docshell/docsh8.cxx                                            |    2 
 sc/source/ui/docshell/macromgr.cxx                                          |    2 
 sc/source/ui/inc/checklistmenu.hxx                                          |    4 -
 sc/source/ui/inc/crnrdlg.hxx                                                |    2 
 sc/source/ui/inc/pvfundlg.hxx                                               |    6 +-
 sc/source/ui/unoobj/PivotTableDataProvider.cxx                              |    4 -
 sc/source/ui/unoobj/linkuno.cxx                                             |    6 +-
 sc/source/ui/vba/vbawindow.cxx                                              |    2 
 sc/source/ui/vba/vbawindows.cxx                                             |    2 
 sc/source/ui/view/dbfunc3.cxx                                               |    6 +-
 sc/source/ui/view/gridwin.cxx                                               |    6 +-
 sc/source/ui/view/gridwin2.cxx                                              |    4 -
 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 -
 sd/inc/CustomAnimationPreset.hxx                                            |    6 +-
 sd/inc/TransitionPreset.hxx                                                 |    2 
 sd/source/filter/eppt/epptooxml.hxx                                         |    2 
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx |    3 -
 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx             |    3 -
 sd/source/ui/framework/module/ModuleController.cxx                          |    6 --
 sd/source/ui/framework/tools/FrameworkHelper.cxx                            |    3 -
 sd/source/ui/tools/IconCache.cxx                                            |    2 
 sd/source/ui/unoidl/facreg.cxx                                              |    2 
 sdext/source/pdfimport/filterdet.cxx                                        |    6 --
 sdext/source/pdfimport/inc/pdfihelper.hxx                                   |    2 
 sdext/source/pdfimport/inc/pdfparse.hxx                                     |    2 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx                              |    8 +--
 sdext/source/pdfimport/sax/saxattrlist.cxx                                  |    7 +-
 sdext/source/pdfimport/sax/saxattrlist.hxx                                  |    4 -
 sdext/source/pdfimport/test/pdfunzip.cxx                                    |    4 -
 sfx2/source/appl/newhelp.cxx                                                |    2 
 sfx2/source/dialog/templdlg.cxx                                             |    2 
 sfx2/source/doc/Metadatable.cxx                                             |    8 +--
 starmath/source/mathmlattr.cxx                                              |    2 
 stoc/source/corereflection/base.hxx                                         |    6 --
 stoc/source/inspect/introspection.cxx                                       |    6 --
 stoc/source/namingservice/namingservice.cxx                                 |    7 --
 stoc/source/security/file_policy.cxx                                        |    2 
 stoc/source/servicemanager/servicemanager.cxx                               |    9 +--
 svgio/inc/svgdocument.hxx                                                   |    5 -
 svgio/source/svgreader/svgtoken.cxx                                         |    2 
 svgio/source/svgreader/svgtools.cxx                                         |    3 -
 svl/source/items/itemprop.cxx                                               |   12 ----
 svl/source/misc/sharedstringpool.cxx                                        |    2 
 svtools/source/contnr/fileview.cxx                                          |    2 
 svtools/source/table/cellvalueconversion.cxx                                |    2 
 svx/source/table/propertyset.hxx                                            |    2 
 svx/source/unodraw/unoprov.cxx                                              |    2 
 sw/inc/SwStyleNameMapper.hxx                                                |    2 
 sw/inc/doc.hxx                                                              |    2 
 sw/inc/docstyle.hxx                                                         |    2 
 sw/inc/numrule.hxx                                                          |    4 -
 sw/source/core/access/accpara.hxx                                           |    3 -
 sw/source/core/doc/DocumentListsManager.cxx                                 |    6 +-
 sw/source/core/doc/number.cxx                                               |    2 
 sw/source/core/doc/swstylemanager.cxx                                       |    3 -
 sw/source/core/inc/DocumentListsManager.hxx                                 |    2 
 sw/source/core/inc/MarkManager.hxx                                          |    4 -
 sw/source/core/unocore/unocoll.cxx                                          |    2 
 sw/source/filter/ww8/wrtw8sty.cxx                                           |    2 
 sw/source/filter/xml/xmlimp.cxx                                             |    4 -
 sw/source/ui/vba/vbadocumentproperties.cxx                                  |    2 
 toolkit/source/controls/dialogcontrol.cxx                                   |    2 
 toolkit/source/controls/geometrycontrolmodel.cxx                            |    2 
 ucb/source/core/ucbstore.cxx                                                |    8 ---
 ucb/source/ucp/file/filnot.hxx                                              |    3 -
 ucb/source/ucp/file/filtask.hxx                                             |    2 
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx                              |    5 -
 ucb/source/ucp/package/pkgprovider.cxx                                      |    8 ---
 ucb/source/ucp/webdav-neon/ContentProperties.hxx                            |    8 ---
 ucb/source/ucp/webdav/ContentProperties.hxx                                 |    8 ---
 ucb/source/ucp/webdav/webdavresponseparser.cxx                              |    2 
 ucbhelper/source/provider/providerhelper.cxx                                |    3 -
 unotools/source/config/cmdoptions.cxx                                       |    2 
 unotools/source/config/eventcfg.cxx                                         |    2 
 unotools/source/config/extendedsecurityoptions.cxx                          |    2 
 unotools/source/config/fontcfg.cxx                                          |    6 +-
 unotools/source/config/optionsdlg.cxx                                       |    2 
 unotools/source/config/pathoptions.cxx                                      |    2 
 unotools/source/i18n/resmgr.cxx                                             |    2 
 unotools/source/misc/fontdefs.cxx                                           |    2 
 unoxml/inc/node.hxx                                                         |    4 -
 uui/source/iahndl.hxx                                                       |    2 
 vbahelper/source/msforms/vbacontrols.cxx                                    |    2 
 vbahelper/source/vbahelper/vbadocumentsbase.cxx                             |    2 
 vcl/inc/PhysicalFontCollection.hxx                                          |    2 
 vcl/inc/implimagetree.hxx                                                   |    6 +-
 vcl/inc/jobset.h                                                            |    4 -
 vcl/inc/opengl/program.hxx                                                  |    2 
 vcl/inc/print.h                                                             |    2 
 vcl/inc/printerinfomanager.hxx                                              |    2 
 vcl/inc/unx/cpdmgr.hxx                                                      |    4 -
 vcl/inc/unx/cupsmgr.hxx                                                     |    4 -
 vcl/inc/unx/fontmanager.hxx                                                 |    6 +-
 vcl/osx/DataFlavorMapping.hxx                                               |    2 
 vcl/source/gdi/configsettings.cxx                                           |    4 -
 vcl/source/gdi/jobset.cxx                                                   |    4 -
 vcl/source/gdi/pdfwriter_impl.cxx                                           |   12 ++--
 vcl/source/gdi/pdfwriter_impl.hxx                                           |    8 +--
 vcl/source/gdi/print.cxx                                                    |    4 -
 vcl/source/gdi/print3.cxx                                                   |   20 +++----
 vcl/source/opengl/OpenGLHelper.cxx                                          |    2 
 vcl/unx/generic/dtrans/X11_selection.cxx                                    |    8 +--
 vcl/unx/generic/dtrans/X11_selection.hxx                                    |    4 -
 vcl/unx/generic/fontmanager/fontconfig.cxx                                  |   10 +--
 vcl/unx/generic/fontmanager/fontmanager.cxx                                 |    8 +--
 vcl/unx/generic/printer/cpdmgr.cxx                                          |   22 ++++----
 vcl/unx/generic/printer/cupsmgr.cxx                                         |   18 +++---
 vcl/unx/generic/printer/ppdparser.cxx                                       |    8 +--
 vcl/unx/generic/printer/printerinfomanager.cxx                              |   26 +++++-----
 vcl/win/app/salinfo.cxx                                                     |    4 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                           |    2 
 writerperfect/qa/unit/WpftFilterTestBase.hxx                                |    2 
 writerperfect/source/common/WPXSvInputStream.cxx                            |    4 -
 xmlhelp/source/cxxhelp/provider/databases.hxx                               |   20 +++----
 xmlhelp/source/cxxhelp/provider/db.hxx                                      |    4 -
 xmloff/source/draw/ximpcustomshape.cxx                                      |    2 
 xmloff/source/forms/property_meta_data.cxx                                  |    4 -
 xmloff/source/transform/EventOOoTContext.cxx                                |    2 
 xmloff/source/transform/TransformerTokenMap.hxx                             |    3 -
 xmlscript/source/xml_helper/xml_impctx.cxx                                  |    4 -
 311 files changed, 545 insertions(+), 664 deletions(-)

New commits:
commit 2559a2a0567dbc392ceb34057c0dc5078bbb9474
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Sat Oct 21 18:04:51 2017 +0200

    loplugin:constmethod in cppu,cppuhelper,idlc
    
    Change-Id: I9138b7e5d53c30488f99e9f9b9fe3f98c8d6858b
    Reviewed-on: https://gerrit.libreoffice.org/43583
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 3b5dafe92cdd..21ae1f398d4b 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -284,8 +284,8 @@ private:
     bool                bOneInstance;
 protected:
     // needed for implementing XUnloadingPreference in inheriting classes
-    bool isOneInstance() {return bOneInstance;}
-    bool isInstance() {return xTheInstance.is();}
+    bool isOneInstance() const {return bOneInstance;}
+    bool isInstance() const {return xTheInstance.is();}
 };
 
 
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index e36cff41e984..2b1193e9a8d8 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -313,7 +313,7 @@ private:
         override;
 
     // needs to be called with rBHelper.rMutex locked:
-    bool isDisposed() { return rBHelper.bDisposed || rBHelper.bInDispose; }
+    bool isDisposed() const { return rBHelper.bDisposed || rBHelper.bInDispose; }
 
     void removeEventListenerFromComponent(
         css::uno::Reference< css::lang::XComponent > const & component);
diff --git a/idlc/inc/astattribute.hxx b/idlc/inc/astattribute.hxx
index 030f6e12f9de..163578a80031 100644
--- a/idlc/inc/astattribute.hxx
+++ b/idlc/inc/astattribute.hxx
@@ -86,13 +86,13 @@ public:
         { return ((m_flags & AF_REMOVABLE) == AF_REMOVABLE); }
 
     bool dumpBlob(
-        typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex);
+        typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex) const;
 
 private:
     void dumpExceptions(
         typereg::Writer & writer, OUString const & documentation,
         DeclList const & exceptions, RTMethodMode flags,
-        sal_uInt16 * methodIndex);
+        sal_uInt16 * methodIndex) const;
 
     const sal_uInt32    m_flags;
     AstType const * m_pType;
diff --git a/idlc/inc/astdeclaration.hxx b/idlc/inc/astdeclaration.hxx
index 9cbd8c95e248..8f4293a97cbf 100644
--- a/idlc/inc/astdeclaration.hxx
+++ b/idlc/inc/astdeclaration.hxx
@@ -68,7 +68,7 @@ public:
         { return m_localName; }
     const OString&   getScopedName() const
         { return m_scopedName; }
-    const OString&   getFullName()
+    const OString&   getFullName() const
         { return m_fullName; }
     virtual const sal_Char* getRelativName() const
         { return m_fullName.getStr()+1; }
@@ -108,7 +108,7 @@ public:
 
     virtual bool dump(RegistryKey& rKey);
 
-    bool isPredefined() { return m_bPredefined; }
+    bool isPredefined() const { return m_bPredefined; }
     void setPredefined(bool bPredefined);
 
 protected:
diff --git a/idlc/inc/astinterfacemember.hxx b/idlc/inc/astinterfacemember.hxx
index ae381afbb58a..826661fee67e 100644
--- a/idlc/inc/astinterfacemember.hxx
+++ b/idlc/inc/astinterfacemember.hxx
@@ -33,7 +33,7 @@ public:
 
     AstInterface* getRealInterface()
         { return m_pRealInterface; }
-    bool isOptional()
+    bool isOptional() const
         { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); }
 private:
     const sal_uInt32    m_flags;
diff --git a/idlc/inc/astscope.hxx b/idlc/inc/astscope.hxx
index 3ce546a087ac..30a0f837c0dc 100644
--- a/idlc/inc/astscope.hxx
+++ b/idlc/inc/astscope.hxx
@@ -42,7 +42,7 @@ public:
         { return m_declarations.begin(); }
     DeclList::const_iterator getIteratorEnd() const
         { return m_declarations.end(); }
-    sal_uInt16 getNodeCount(NodeType nType);
+    sal_uInt16 getNodeCount(NodeType nType) const;
 
     // Name look up mechanism
     AstDeclaration* lookupByName(const OString& scopedName);
@@ -54,7 +54,7 @@ public:
     // Look up a predefined type by its ExprType
     AstDeclaration* lookupPrimitiveType(ExprType type);
 
-    AstDeclaration* lookupForAdd(AstDeclaration const * pDecl);
+    AstDeclaration* lookupForAdd(AstDeclaration const * pDecl) const;
 
 protected:
     AstDeclaration const * getLast() const
diff --git a/idlc/inc/astservicemember.hxx b/idlc/inc/astservicemember.hxx
index 1254848532fb..d23cda303cc8 100644
--- a/idlc/inc/astservicemember.hxx
+++ b/idlc/inc/astservicemember.hxx
@@ -33,7 +33,7 @@ public:
 
     AstService* getRealService()
         { return m_pRealService; }
-    bool isOptional()
+    bool isOptional() const
         { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); }
 private:
     const sal_uInt32    m_flags;
diff --git a/idlc/inc/aststack.hxx b/idlc/inc/aststack.hxx
index 8793f918d52a..fa13d7affd92 100644
--- a/idlc/inc/aststack.hxx
+++ b/idlc/inc/aststack.hxx
@@ -29,7 +29,7 @@ public:
     AstStack();
     ~AstStack();
 
-    sal_uInt32 depth() { return m_top;}
+    sal_uInt32 depth() const { return m_top;}
     AstScope* top();
     AstScope* bottom();
     AstScope* nextToTop();
diff --git a/idlc/inc/fehelper.hxx b/idlc/inc/fehelper.hxx
index 8ebc1c9f44ce..d66818dd22ca 100644
--- a/idlc/inc/fehelper.hxx
+++ b/idlc/inc/fehelper.hxx
@@ -29,9 +29,9 @@ class FeDeclarator final
 public:
     FeDeclarator(const OString& name);
     ~FeDeclarator();
-    const OString& getName()
+    const OString& getName() const
         { return m_name; }
-    bool checkType(AstDeclaration const * pType);
+    bool checkType(AstDeclaration const * pType) const;
     static AstType const * compose(AstDeclaration const * pDecl);
 private:
     OString  m_name;
@@ -52,7 +52,7 @@ public:
             delete m_pName;
     }
 
-    NodeType getNodeType()
+    NodeType getNodeType() const
         { return m_nodeType; }
     OString* getName()
         { return m_pName; }
diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx
index 2811c6b6b027..83807665e68e 100644
--- a/idlc/inc/idlc.hxx
+++ b/idlc/inc/idlc.hxx
@@ -54,15 +54,15 @@ public:
         { return m_pScopes; }
     AstModule* getRoot()
         { return m_pRoot; }
-    const OString& getFileName()
+    const OString& getFileName() const
         { return m_fileName; }
     void setFileName(const OString& fileName)
         { m_fileName = fileName; addInclude(fileName); }
-    const OString& getMainFileName()
+    const OString& getMainFileName() const
         { return m_mainFileName; }
     void setMainFileName(const OString& mainFileName)
         { m_mainFileName = mainFileName; }
-    const OString& getRealFileName()
+    const OString& getRealFileName() const
         { return m_realFileName; }
     void setRealFileName(const OString& realFileName)
         { m_realFileName = realFileName; }
@@ -77,23 +77,23 @@ public:
             m_bIsDocValid = true;
         }
     OUString processDocumentation();
-    bool isInMainFile()
+    bool isInMainFile() const
         { return m_bIsInMainfile; }
     void setInMainfile(bool bInMainfile)
         { m_bIsInMainfile = bInMainfile; }
-    sal_uInt32 getErrorCount()
+    sal_uInt32 getErrorCount() const
         { return m_errorCount; }
     void incErrorCount()
         { m_errorCount++; }
-    sal_uInt32 getWarningCount()
+    sal_uInt32 getWarningCount() const
         { return m_warningCount; }
     void incWarningCount()
         { m_warningCount++; }
-    sal_uInt32 getLineNumber()
+    sal_uInt32 getLineNumber() const
         { return m_lineNumber; }
-    sal_uInt32 getOffsetStart()
+    sal_uInt32 getOffsetStart() const
         { return m_offsetStart; }
-    sal_uInt32 getOffsetEnd()
+    sal_uInt32 getOffsetEnd() const
         { return m_offsetEnd; }
     void setOffset( sal_uInt32 start, sal_uInt32 end)
         { m_offsetStart = start; m_offsetEnd = end; }
@@ -101,7 +101,7 @@ public:
         { m_lineNumber = lineNumber; }
     void incLineNumber()
         { m_lineNumber++; }
-    ParseState getParseState()
+    ParseState getParseState() const
         { return m_parseState; }
     void setParseState(ParseState parseState)
         { m_parseState = parseState; }
diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index 6cd9080bce92..b97f3a42b84b 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -49,11 +49,11 @@ public:
     static bool badOption(char const * reason, std::string const & rArg);
     bool setOption(char const * option, std::string const & rArg);
 
-    OString prepareHelp();
-    OString prepareVersion();
+    OString prepareHelp() const;
+    OString prepareVersion() const;
 
     const OString&   getProgramName() const { return m_program;}
-    bool                isValid(const OString& option);
+    bool                isValid(const OString& option) const;
     /// @throws IllegalArgument
     const OString&   getOption(const OString& option);
 
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 34d9a16bf8a6..75e28ea7d789 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -322,7 +322,7 @@ bool AstService::dump(RegistryKey& rKey)
 }
 
 bool AstAttribute::dumpBlob(
-    typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex)
+    typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex) const
 {
     RTFieldAccess accessMode = RTFieldAccess::INVALID;
 
@@ -383,7 +383,7 @@ bool AstAttribute::dumpBlob(
 
 void AstAttribute::dumpExceptions(
     typereg::Writer & writer, OUString const & documentation,
-    DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex)
+    DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex) const
 {
     if (!exceptions.empty()) {
         OSL_ASSERT(methodIndex != nullptr);
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index c90870ebeeff..86c150fa718f 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -83,7 +83,7 @@ AstDeclaration* AstScope::addDeclaration(AstDeclaration* pDecl)
     return pDecl;
 }
 
-sal_uInt16 AstScope::getNodeCount(NodeType nodeType)
+sal_uInt16 AstScope::getNodeCount(NodeType nodeType) const
 {
     DeclList::const_iterator iter = getIteratorBegin();
     DeclList::const_iterator end = getIteratorEnd();
@@ -319,7 +319,7 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
     return nullptr;
 }
 
-AstDeclaration* AstScope::lookupForAdd(AstDeclaration const * pDecl)
+AstDeclaration* AstScope::lookupForAdd(AstDeclaration const * pDecl) const
 {
     if ( !pDecl )
         return nullptr;
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 3a3e5324e303..168cf56fec7f 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -30,7 +30,7 @@ FeDeclarator::~FeDeclarator()
 {
 }
 
-bool FeDeclarator::checkType(AstDeclaration const * type)
+bool FeDeclarator::checkType(AstDeclaration const * type) const
 {
     OString tmp(m_name);
     sal_Int32 count = m_name.lastIndexOf( ':' );
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 58908c9f38ad..92dcb6dbf783 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -368,7 +368,7 @@ bool Options::initOptions(std::vector< std::string > & rArgs)
   return true;
 }
 
-OString Options::prepareHelp()
+OString Options::prepareHelp() const
 {
     OString help("\nusing: ");
     help += m_program + " [-options] <file_1> ... <file_n> | @<filename> | -stdin\n";
@@ -402,7 +402,7 @@ OString Options::prepareHelp()
     return help;
 }
 
-OString Options::prepareVersion()
+OString Options::prepareVersion() const
 {
     OString version(m_program);
     version += " Version 1.1\n\n";
@@ -410,7 +410,7 @@ OString Options::prepareVersion()
 }
 
 
-bool Options::isValid(const OString& option)
+bool Options::isValid(const OString& option) const
 {
     return (m_options.count(option) > 0);
 }
diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index 6c363d209b55..b2b97bd05afd 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -129,7 +129,7 @@ private:
 
     SAL_DLLPRIVATE char read() { return pos_ == end_ ? '\0' : *pos_++; }
 
-    SAL_DLLPRIVATE char peek() { return pos_ == end_ ? '\0' : *pos_; }
+    SAL_DLLPRIVATE char peek() const { return pos_ == end_ ? '\0' : *pos_; }
 
     SAL_DLLPRIVATE void normalizeLineEnds(Span const & text);
 
commit 87a9979c8938b800aab6e35903d60d24892e7f2e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Oct 19 17:18:17 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index b5eaec4568b5..5c1fd4229511 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -320,8 +320,7 @@ private:
 
 
 typedef std::unordered_map< OUString,
-                         css::beans::PropertyValue,
-                         OUStringHash > tPropValMap;
+                         css::beans::PropertyValue > tPropValMap;
 
 class Document: public ::VCLXAccessibleComponent, public ::SfxListener
 {
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1ce0e4b65b5b..b2aaae37cdab 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1138,8 +1138,7 @@ struct ClassModuleRunInitItem
 // Derive from unordered_map type instead of typedef
 // to allow forward declaration in sbmod.hxx
 class ModuleInitDependencyMap : public
-    std::unordered_map< OUString, ClassModuleRunInitItem,
-                          OUStringHash >
+    std::unordered_map< OUString, ClassModuleRunInitItem >
 {};
 
 void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0dea0076bc90..1be0133628df 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3205,7 +3205,7 @@ Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUS
     return xEnum;
 }
 
-typedef std::unordered_map< OUString, Any, OUStringHash > VBAConstantsHash;
+typedef std::unordered_map< OUString, Any > VBAConstantsHash;
 
 VBAConstantHelper&
 VBAConstantHelper::instance()
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 5cc2c0d11992..875e15a60897 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -69,7 +69,7 @@ typedef ::cppu::WeakImplHelper<
 
 class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
 {
-    typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap;
+    typedef std::unordered_map < OUString, sal_Int32 > NameContainerNameMap;
 
     NameContainerNameMap mHashMap;
     std::vector< OUString > mNames;
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 2fae21ecf514..b31e34966d4e 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -364,7 +364,7 @@ public:
     virtual void Clear() override;
 };
 
-typedef std::unordered_map< OUString, css::uno::Any, OUStringHash > VBAConstantsHash;
+typedef std::unordered_map< OUString, css::uno::Any > VBAConstantsHash;
 
 typedef std::vector< OUString > VBAConstantsVector;
 
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 58b26077e9ac..1b0831a7701e 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -103,7 +103,7 @@ public:
 };
 
 
-typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash > ModuleInfoMap;
+typedef std::unordered_map< OUString, css::script::ModuleInfo > ModuleInfoMap;
 
 typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE;
 
@@ -111,7 +111,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
 {
     friend class SfxScriptLibraryContainer;
 
-    typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash > ModuleInfoMap;
+    typedef std::unordered_map< OUString, css::script::ModuleInfo > ModuleInfoMap;
 
     bool mbLoadedSource;
     bool mbLoadedBinary;
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index e099f3b3251a..991716b423e8 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -207,7 +207,7 @@ private:
     static void flushCode(
         unsigned char const * begin, unsigned char const * end);
 
-    typedef std::unordered_map< OUString, Vtables, OUStringHash > Map;
+    typedef std::unordered_map< OUString, Vtables > Map;
 
     osl::Mutex m_mutex;
     Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index c5117ac40b6f..fe3c1f391147 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -88,7 +88,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
         t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 1d1eeccd97ae..17b95473f92c 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -143,7 +143,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 1620467baae9..fa6ffebfbc17 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -81,7 +81,7 @@ public:
     std::type_info * getRtti(typelib_TypeDescription const & type);
 
 private:
-    typedef std::unordered_map<OUString, std::type_info *, OUStringHash> Map;
+    typedef std::unordered_map<OUString, std::type_info *> Map;
 
     void * app_;
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 74dabc8acc77..1a51c6e6786a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index a025c82f3e59..43e255c21cf6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 855e75cfe8b4..3464ad7c3d39 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 95688e33f7d0..27d6bc1a2cbe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 3a67731321d5..6bbcfb2565c1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 6f0581d31bf2..27a587117145 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 50220539498e..01a4446eb19c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
index 0e6537256356..e17e5fba14bf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 225a241d412d..cd6c79581736 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 95688e33f7d0..27d6bc1a2cbe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 74dabc8acc77..1a51c6e6786a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 6049fb5094cd..9fc893371039 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 261339c2b533..457ab485d21a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
index 261339c2b533..457ab485d21a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 1bc4a8e6caa0..4d6683ff5640 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -41,7 +41,7 @@ namespace {
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
 
     osl::Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 1d1eeccd97ae..17b95473f92c 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -143,7 +143,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 8e403ac522c8..0b484521f7a1 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -87,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 7b957003b4d1..18326431dbad 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 3fa94744d296..656dab7aa323 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -83,7 +83,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
 //#### RTTI simulation #############################################################################
 
 
-typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap;
+typedef std::unordered_map< OUString, void * > t_string2PtrMap;
 
 class RTTInfos
 {
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 6dafb7396fd4..b96d354f14cd 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -306,7 +306,7 @@ static inline OUString toRTTIname(
 
 //RTTI simulation
 
-typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap;
+typedef std::unordered_map< OUString, void * > t_string2PtrMap;
 class type_info_descriptor;
 
 class RTTInfos
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 6df5acbff883..47a4af246977 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -155,7 +155,7 @@ private:
     sal_Int32 calculate(
         typelib_InterfaceTypeDescription * type, sal_Int32 offset);
 
-    std::unordered_map< OUString, sal_Int32, OUStringHash > m_map;
+    std::unordered_map< OUString, sal_Int32 > m_map;
 };
 
 sal_Int32 VtableFactory::BaseOffset::calculate(
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index f40c26e88eef..a8d395c6e309 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -119,7 +119,7 @@ struct JNI_type_info_holder
 };
 
 typedef std::unordered_map<
-    OUString, JNI_type_info_holder, OUStringHash > t_str2type;
+    OUString, JNI_type_info_holder > t_str2type;
 
 class JNI_info
 {
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index a3fce00e1c7b..520d37e1f8c4 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star;
 
 namespace comphelper {
 
-typedef std::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>, OUStringHash>
+typedef std::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>>
 EmbeddedObjectContainerNameMap;
 
 struct EmbedImpl
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 9c03be3fd861..d803c6fee8c3 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -45,7 +45,7 @@ namespace comphelper
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::beans::PropertyState_DIRECT_VALUE;
 
-    typedef std::unordered_map< OUString, Any, OUStringHash >    NamedValueRepository;
+    typedef std::unordered_map< OUString, Any >    NamedValueRepository;
 
     struct NamedValueCollection_Impl
     {
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index dd97cee7f4fe..8bda3f26bf1f 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -75,7 +75,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
 
     // fill aDelegatorProps with names from _rProperties for a fast existence check
     // different kinds of properties are processed differently
-    std::unordered_set< OUString, OUStringHash > aDelegatorProps;
+    std::unordered_set< OUString > aDelegatorProps;
     aDelegatorProps.reserve( _rProperties.getLength() );
     for( auto &delegateProp: _rProperties )
     {
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index cc1d2e18727c..6ce3f3052493 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -49,7 +49,7 @@ namespace connectivity
                 {
                 }
             };
-            typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap;
+            typedef std::unordered_map< OUString, AliasEntry > AliasMap;
 
         private:
             AliasMap    m_aAliasMap;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 7e469d0d7a51..9f18fdbb33e0 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -146,7 +146,7 @@ namespace connectivity
         class MQueryHelperResultEntry
         {
         private:
-            typedef std::unordered_map< OString, OUString, OStringHash >  FieldMap;
+            typedef std::unordered_map< OString, OUString >  FieldMap;
 
             FieldMap                m_Fields;
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index b79df17349f5..324889b72100 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -91,8 +91,7 @@ typedef std::vector< ColumnMetaData > ColumnMetaDataVector;
 typedef std::unordered_map
 <
    OUString,
-   sal_Int32,
-   OUStringHash
+   sal_Int32
 > BaseTypeMap;
 
 struct ImplementationStatics
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 3ae5de20b3f3..6fadbbe199fa 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -125,11 +125,7 @@ css::uno::Sequence< sal_Int32 > string2intarray( const OUString & str );
 css::uno::Sequence< OUString > convertMappedIntArray2StringArray(
     const Int2StringMap &map, const css::uno::Sequence< sal_Int32> &source );
 
-typedef std::unordered_map
-<
-    OString,
-    OString,
-    OStringHash > String2StringMap;
+typedef std::unordered_map< OString, OString > String2StringMap;
 
 OUString querySingleValue(
     const css::uno::Reference< css::sdbc::XConnection > &connection,
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index 0e788d1abb05..f53b0303ae1b 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -88,8 +88,7 @@ public:
 typedef std::unordered_map
 <
    OUString,
-   sal_Int32,
-   OUStringHash
+   sal_Int32
 > String2IntMap;
 
 typedef ::cppu::WeakComponentImplHelper
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 94bb57271f87..fe02245527cf 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -46,7 +46,6 @@
 
 
 using ::rtl::OUString;
-using ::rtl::OUStringHash;
 
 namespace
 {
@@ -102,14 +101,14 @@ struct FctPtrHash
 
 // mapping from environment name to environment
 typedef std::unordered_map<
-    OUString, uno_Environment *, OUStringHash > OUString2EnvironmentMap;
+    OUString, uno_Environment * > OUString2EnvironmentMap;
 
 // mapping from ptr to object entry
 typedef std::unordered_map<
     void *, ObjectEntry *, FctPtrHash > Ptr2ObjectMap;
 // mapping from oid to object entry
 typedef std::unordered_map<
-    OUString, ObjectEntry *, OUStringHash > OId2ObjectMap;
+    OUString, ObjectEntry * > OId2ObjectMap;
 
 struct EnvironmentsData
 {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index c1b52f4f27a3..ecd89ecdc328 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -50,7 +50,6 @@ using namespace osl;
 using namespace com::sun::star::uno;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::rtl::OUStringHash;
 
 namespace cppu
 {
@@ -137,7 +136,7 @@ struct FctPtrHash
 };
 
 typedef std::unordered_map<
-    OUString, MappingEntry *, OUStringHash > t_OUString2Entry;
+    OUString, MappingEntry * > t_OUString2Entry;
 typedef std::unordered_map<
     uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry;
 
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 7d9ecd97b3c6..496e5ae75b1d 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star;
 
 using rtl::OUString;
 using rtl::OUStringBuffer;
-using rtl::OUStringHash;
 
 namespace cppu
 {
@@ -138,7 +137,7 @@ protected:
             , lateInit( lateInit_ )
             {}
     };
-    typedef std::unordered_map< OUString, ContextEntry * , OUStringHash > t_map;
+    typedef std::unordered_map< OUString, ContextEntry *  > t_map;
     t_map m_map;
 
     Reference< lang::XMultiComponentFactory > m_xSMgr;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 736b228e86c5..3cb3a4b33547 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -766,7 +766,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
 {
     if ( !m_pRootEntry )
     {
-        typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo;
+        typedef std::unordered_map< OUString, bool > MenuInfo;
         MenuInfo aMenuInfo;
 
         m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) );
@@ -2368,8 +2368,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
 
 SvxEntries* ToolbarSaveInData::GetEntries()
 {
-    typedef std::unordered_map<OUString, bool,
-                               OUStringHash > ToolbarInfo;
+    typedef std::unordered_map<OUString, bool > ToolbarInfo;
 
     ToolbarInfo aToolbarInfo;
 
@@ -2978,8 +2977,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
     pTbSymbol->set_height_request(aTbSize.Height());
     pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING);
 
-    typedef std::unordered_map< OUString, bool,
-                                OUStringHash > ImageInfo;
+    typedef std::unordered_map< OUString, bool > ImageInfo;
 
     pTbSymbol->SetPageScroll( true );
 
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 736c4de3cbcf..cd6ecb5533e1 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -35,8 +35,7 @@
 
 class SvTreeListBox;
 
-typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
-                            OUStringHash > EventsHash;
+typedef std::unordered_map< OUString, std::pair< OUString, OUString > > EventsHash;
 
 struct EventDisplayName
 {
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 6cdcde954fa2..0b80c7b06330 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -38,8 +38,7 @@
 #define OBJTYPE_SCRIPTCONTAINER 3L
 #define OBJTYPE_SFROOT          4L
 
-typedef std::unordered_map < OUString, OUString,
-                             OUStringHash > Selection_hash;
+typedef std::unordered_map < OUString, OUString > Selection_hash;
 
 class SFEntry;
 
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index 6fa4c6695e3e..aa0b89b47060 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -56,7 +56,7 @@ namespace dbaccess
         }
     };
 
-    typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
+    typedef std::unordered_map< OUString, SubComponentDescriptor > MapStringToCompDesc;
     typedef std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
 
 } // namespace dbaccess
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
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3624f43423ee..4917ad89a7b7 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2634,7 +2634,7 @@ struct CompareSvxAutocorrWordList
 namespace {
 
 typedef std::set<SvxAutocorrWord*, CompareSvxAutocorrWordList> AutocorrWordSetType;
-typedef std::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType;
+typedef std::unordered_map<OUString, SvxAutocorrWord*> AutocorrWordHashType;
 
 }
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 885630c168b2..191131b068a2 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -100,7 +100,7 @@ static const DispatchInfo SupportedCommandsArray[] =
     { nullptr                         ,   0                               , false }
 };
 
-typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash > CmdToInfoCache;
+typedef std::unordered_map< OUString, CacheDispatchInfo > CmdToInfoCache;
 
 const CmdToInfoCache& GetCommandToInfoCache()
 {
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index c46530290873..dbf1b74924eb 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -50,9 +50,9 @@ namespace ole_adapter
 {
 
 
-typedef std::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap;
+typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap;
 
-typedef std::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap;
+typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap;
 
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
 // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index a92cf97b2bfc..22036dbe4762 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -78,15 +78,13 @@ struct MemberInfo
 typedef std::unordered_map
 <
     OUString,
-    DISPID,
-    OUStringHash
+    DISPID
 > NameToIdMap;
 
 typedef std::unordered_map
 <
     OUString,
-    bool,
-    OUStringHash
+    bool
 > BadNameMap;
 
 typedef std::unordered_map
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 35fb2a3ae551..1d219329c66c 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -309,7 +309,7 @@ namespace pcr
     class EventHolder : public EventHolder_Base
     {
     private:
-        typedef std::unordered_map< OUString, ScriptEventDescriptor, OUStringHash >  EventMap;
+        typedef std::unordered_map< OUString, ScriptEventDescriptor >  EventMap;
         typedef std::map< EventId, EventMap::iterator >                                       EventMapIndexAccess;
 
         EventMap            m_aEventNameAccess;
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index c1d3c72214b6..21e87766a07d 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -65,7 +65,7 @@ namespace pcr
             const OString& _sUniqueBrowseId );
     };
 
-    typedef std::unordered_map< OUString, EventDescription, OUStringHash >   EventMap;
+    typedef std::unordered_map< OUString, EventDescription >   EventMap;
 
 
     //= EventHandler
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 19c85ba47330..0fe62c6330c5 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -30,7 +30,7 @@ namespace pcr
 {
 
 
-    typedef std::unordered_map< OUString, css::beans::Property, OUStringHash >
+    typedef std::unordered_map< OUString, css::beans::Property >
         PropertyMap;
 
 
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 8d937f7b6a30..efb18ec27a84 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -110,9 +110,9 @@ namespace pcr
         typedef css::uno::Reference< css::inspection::XPropertyHandler >
                                                         PropertyHandlerRef;
         typedef std::vector< PropertyHandlerRef >     PropertyHandlerArray;
-        typedef std::unordered_map< OUString, PropertyHandlerRef, OUStringHash >
+        typedef std::unordered_map< OUString, PropertyHandlerRef >
                                                         PropertyHandlerRepository;
-        typedef std::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash >
+        typedef std::unordered_multimap< OUString, PropertyHandlerRef >
                                                         PropertyHandlerMultiRepository;
         PropertyHandlerRepository                       m_aPropertyHandlers;
         PropertyHandlerMultiRepository                  m_aDependencyHandlers;
@@ -130,7 +130,7 @@ namespace pcr
         /// the property we're just committing
         OUString                                        m_sCommittingProperty;
 
-        typedef std::unordered_map< OUString, sal_uInt16, OUStringHash >     HashString2Int16;
+        typedef std::unordered_map< OUString, sal_uInt16 >     HashString2Int16;
         HashString2Int16                                m_aPageIds;
 
         bool        m_bContainerFocusListening;
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index e1b2dcd2a02f..b798f2d6cee7 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -146,9 +146,8 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
 /** @short  represent an item list of a FilterCache
             instance.
  */
-typedef std::unordered_map< OUString                    ,
-                            CacheItem                          ,
-                            OUStringHash > CacheItemList;
+typedef std::unordered_map< OUString,
+                            CacheItem > CacheItemList;
 
 
 /** @short  supports registration of multiple key to
@@ -163,9 +162,8 @@ typedef std::unordered_map< OUString                    ,
             there we need key-value pairs too, which can't be provided
             by a pure vector!
  */
-typedef std::unordered_map< OUString                    ,
-                            OUStringList                       ,
-                            OUStringHash > CacheItemRegistration;
+typedef std::unordered_map< OUString,
+                            OUStringList > CacheItemRegistration;
 
 
 /** @short  is used to collect all matching types of an URL
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index b6147ac00e1c..149ddba60552 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -45,9 +45,7 @@ namespace filter{
     @attention  This class is not threadsafe implemented. Because it's not necessary.
                 But you have to make sure that it's not used as such :-)
  */
-class QueryTokenizer : public std::unordered_map< OUString                    ,
-                                                  OUString                    ,
-                                                  OUStringHash >
+class QueryTokenizer : public std::unordered_map< OUString, OUString >
 {
 
     // member
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 34b7b20a47c1..e9e8fad10a85 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -187,7 +187,7 @@ public:
     typedef Sequence< Reference< XInterface > >                                                                 ObjectSequence;
 
     typedef std::unordered_set< sal_Unicode, HashUChar >                                                    UCharSet;
-    typedef std::unordered_map< OUString, UCharSet, OUStringHash >                                          UCharSetMap;
+    typedef std::unordered_map< OUString, UCharSet >                                          UCharSetMap;
     typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface >             UCharSetMapMap;
 
     typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface >         UOStringMap;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 46fced788f72..fbfe54bfe475 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -217,7 +217,7 @@ struct BulletListItemInfo
 class SVGTextWriter final
 {
   public:
-    typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash >         BulletListItemInfoMap;
+    typedef std::unordered_map< OUString, BulletListItemInfo >         BulletListItemInfoMap;
 
   private:
     SVGExport&                                  mrExport;
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 1ce45ea84c0b..ff7225114714 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -65,7 +65,7 @@ namespace frm
         css::uno::Reference< css::sdbc::XConnection >                 m_xConnection;
         css::uno::Reference< css::awt::XWindow >                      m_xMessageParent;
 
-        typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String;
+        typedef std::unordered_map< OUString, OUString > MapString2String;
         MapString2String                m_aDisplayItemToValueItem;
 
         OUString                        m_aText;
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 647ccc83fee1..59d0ea530845 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -74,7 +74,7 @@ namespace frm
     };
 
 typedef std::vector<css::uno::Reference<css::uno::XInterface>> OInterfaceArray;
-typedef std::unordered_multimap< OUString, css::uno::Reference<css::uno::XInterface>, OUStringHash > OInterfaceMap;
+typedef std::unordered_multimap< OUString, css::uno::Reference<css::uno::XInterface> > OInterfaceMap;
 
 
 // OInterfaceContainer
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index ea2ffca31e5d..346c6c6a4c9c 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -317,7 +317,7 @@ namespace frm
 
 class PropertyInfoService
 {
-    typedef std::unordered_map<OUString, sal_Int32, OUStringHash> PropertyMap;
+    typedef std::unordered_map<OUString, sal_Int32> PropertyMap;
     static PropertyMap      s_AllKnownProperties;
 
 public:
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 3c755616553d..31859fea13e0 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -60,12 +60,12 @@ struct FWI_DLLPUBLIC ProtocolHandler
     uno implementation names as value. Overloading of the index operator makes it possible
     to search for a key by using a full qualified URL on list of all possible pattern keys.
 */
-typedef std::unordered_map<OUString, OUString, OUStringHash> PatternHash;
+typedef std::unordered_map<OUString, OUString> PatternHash;
 
 /**
     This hash holds protocol handler structs by her names.
 */
-typedef std::unordered_map<OUString, ProtocolHandler, OUStringHash> HandlerHash;
+typedef std::unordered_map<OUString, ProtocolHandler> HandlerHash;
 
 /**
     @short          this hash makes it easy to find a protocol handler by using his uno implementation name.
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index b53a3de27796..7b6405033aba 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -46,7 +46,7 @@ namespace framework
             virtual css::uno::Type SAL_CALL getElementType(  ) override;
 
         private:
-            typedef std::unordered_map<OUString, css::uno::Reference< css::graphic::XGraphic >, OUStringHash> NameGraphicHashMap;
+            typedef std::unordered_map<OUString, css::uno::Reference< css::graphic::XGraphic >> NameGraphicHashMap;
             NameGraphicHashMap              m_aNameToElementMap;
             css::uno::Sequence< OUString >  m_aSeq;
     };
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index d759674cf1a1..783d1ce88377 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -27,11 +27,9 @@ namespace framework
 {
 
 typedef std::unordered_map< OUString,
-                            OUString,
-                            OUStringHash > CommandToImageNameMap;
+                            OUString > CommandToImageNameMap;
 typedef std::unordered_map< OUString,
-                            bool,
-                            OUStringHash > CommandMap;
+                            bool > CommandMap;
 
 }
 
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index a322c854af9f..eed42f2238e6 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -35,7 +35,7 @@ struct CommandInfo
     sal_Int16                   nImageInfo;
 };
 
-typedef std::unordered_map<OUString, CommandInfo, OUStringHash> CommandToInfoMap;
+typedef std::unordered_map<OUString, CommandInfo> CommandToInfoMap;
 
 } // namespace framework
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index e90e94d2b9c4..68d445ff7881 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -63,7 +63,7 @@ struct PopupControllerEntry
     css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider;
 };
 
-typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash > PopupControllerCache;
+typedef std::unordered_map< OUString, PopupControllerEntry > PopupControllerCache;
 
 class MenuBarManager:
     protected cppu::BaseMutex,
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index d5f9e11f70b4..dcddc5a1909e 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -148,7 +148,7 @@ class ToolBarManager : public ToolbarManager_Base
     protected:
         typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::frame::XStatusListener > >  ToolBarControllerMap;
         typedef ::std::vector< css::uno::Reference< css::frame::XSubToolbarController > >             SubToolBarControllerVector;
-        typedef std::unordered_map<OUString, SubToolBarControllerVector, OUStringHash>                                                SubToolBarToSubToolBarControllerMap;
+        typedef std::unordered_map<OUString, SubToolBarControllerVector>                                                SubToolBarToSubToolBarControllerMap;
 
         bool m_bDisposed : 1,
              m_bAddedToTaskPaneList : 1,
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index c8e5ad01dc32..92a2362b25a3 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -74,12 +74,10 @@ private:
 
 public:
         typedef std::unordered_map< OUString,
-                                    OUString,
-                                    OUStringHash > ModuleToCommandFileMap;
+                                    OUString > ModuleToCommandFileMap;
 
         typedef std::unordered_map< OUString,
-                                    css::uno::Reference< css::container::XNameAccess >,
-                                    OUStringHash > UICommandsHashMap;
+                                    css::uno::Reference< css::container::XNameAccess > > UICommandsHashMap;
 
     protected:
         UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool  );
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index dcdc60e58d09..edcc7f7e2e02 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -58,9 +58,7 @@ namespace framework {
 
     private:
         class FactoryManagerMap : public std::unordered_map<OUString,
-                                                            OUString,
-                                                            OUStringHash
-                                                            >
+                                                            OUString>
         {
         };
 
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 1b34b38a3cb2..dcbf4daae09f 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -72,8 +72,7 @@ private:
         ControllerInfo(){}
     };
     class MenuControllerMap : public std::unordered_map< OUString,
-                                                         ControllerInfo,
-                                                         OUStringHash >
+                                                         ControllerInfo >
     {
     };
 
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index fe134597bc90..cd41974d51e8 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -89,9 +89,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
     private:
         OUString getErrorLineString();
 
-        class ImageHashMap : public std::unordered_map< OUString     ,
-                                                        Image_XML_Entry        ,
-                                                        OUStringHash >
+        class ImageHashMap : public std::unordered_map< OUString, Image_XML_Entry >
         {
         };
 
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 896c71ff6fef..b0cb57c4fe23 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -88,8 +88,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
         OUString getErrorLineString();
 
         class StatusBarHashMap : public std::unordered_map<OUString,
-                                                           StatusBar_XML_Entry,
-                                                           OUStringHash >
+                                                           StatusBar_XML_Entry >
         {
         };
 
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 7dc7133ec337..c2be53da64d1 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -87,8 +87,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
         OUString getErrorLineString();
 
         class ToolBoxHashMap : public std::unordered_map<OUString,
-                                                         ToolBox_XML_Entry,
-                                                         OUStringHash >
+                                                         ToolBox_XML_Entry>
         {
         };
 
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 0948f63c4c6c..dc0f8e3850cc 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -77,7 +77,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
     sal_Int32                                                                             c1        = lProvider.getLength();
     sal_Int32                                                                             i1        = 0;
 
-    std::unordered_map<OUString, css::frame::DispatchInformation, OUStringHash> lInfos;
+    std::unordered_map<OUString, css::frame::DispatchInformation> lInfos;
 
     for (i1=0; i1<c1; ++i1)
     {
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 89a037799942..3017197b7b16 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -228,10 +228,10 @@ class AddonsOptions_Impl : public ConfigItem
             void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
         };
 
-        typedef std::unordered_map< OUString, ImageEntry, OUStringHash > ImageManager;
-        typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > StringToIndexMap;
+        typedef std::unordered_map< OUString, ImageEntry > ImageManager;
+        typedef std::unordered_map< OUString, sal_uInt32 > StringToIndexMap;
         typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
-        typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;
+        typedef std::unordered_map< OUString, MergeToolbarInstructionContainer > ToolbarMergingInstructions;
 
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent our module tree
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 28302e849020..fc295ae004dc 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -52,7 +52,7 @@ class AcceleratorCache
             commands -> keys
         */
         typedef ::std::vector< css::awt::KeyEvent > TKeyList;
-        typedef std::unordered_map<OUString, TKeyList, OUStringHash> TCommand2Keys;
+        typedef std::unordered_map<OUString, TKeyList> TCommand2Keys;
 
         /** TODO document me
             keys -> commands
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 639d6e09a9d7..0f610e599e3a 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -52,7 +52,7 @@ class KeyMapping
         };
 
         /** @short  hash structure to map identifier to key codes. */
-        typedef std::unordered_map<OUString, sal_Int16, OUStringHash> Identifier2CodeHash;
+        typedef std::unordered_map<OUString, sal_Int16> Identifier2CodeHash;
 
         /** @short  hash structure to map key codes to identifier. */
         typedef std::unordered_map<sal_Int16, OUString> Code2IdentifierHash;
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 0e5eb0c39dac..43d7e1ba75f8 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -56,9 +56,8 @@ class StorageHolder final
         };
 
         /** @short  TODO */
-        typedef std::unordered_map< OUString                    ,
-                                    TStorageInfo                       ,
-                                    OUStringHash > TPath2StorageInfo;
+        typedef std::unordered_map< OUString,
+                                    TStorageInfo > TPath2StorageInfo;
 
     // member
     private:
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 37d8032bcd04..93aa48f98431 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -419,7 +419,7 @@ private:
 
     WindowCommandDispatch*                                                  m_pWindowCommandDispatch;
 
-    typedef std::unordered_map<OUString, css::beans::Property, OUStringHash> TPropInfoHash;
+    typedef std::unordered_map<OUString, css::beans::Property> TPropInfoHash;
     TPropInfoHash m_lProps;
 
     ListenerHash m_lSimpleChangeListener;
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 243e36f848ca..26bd6bfae718 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -136,7 +136,7 @@ class PathSettings : private cppu::BaseMutex
             bool bIsReadonly;
     };
 
-    typedef std::unordered_map<OUString, PathSettings::PathInfo, OUStringHash> PathHash;
+    typedef std::unordered_map<OUString, PathSettings::PathInfo> PathHash;
 
     enum EChangeOp
     {
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index d851deb0152e..ce7e0b4491ae 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -180,7 +180,7 @@ protected:
     OUString const & impl_getSubstituteVariableValue( const OUString& variable );
 
 private:
-    typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
+    typedef std::unordered_map<OUString, PreDefVariable>
         VarNameToIndexMap;
 
     VarNameToIndexMap            m_aPreDefVarMap;         // Mapping from pre-def variable names to enum for array access
diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx
index 8d5a3c9ef309..8b5dbe3a82b5 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.hxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.hxx
@@ -28,7 +28,7 @@ namespace vcl
 class CommandImageResolver final
 {
 private:
-    typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap;
+    typedef std::unordered_map<OUString, OUString > CommandToImageNameMap;
 
     CommandToImageNameMap m_aCommandToImageNameMap;
     std::vector<OUString> m_aImageCommandNameVector;
diff --git a/framework/source/uiconfiguration/image.h b/framework/source/uiconfiguration/image.h
index 9b0542f1462f..1005fc39cdf1 100644
--- a/framework/source/uiconfiguration/image.h
+++ b/framework/source/uiconfiguration/image.h
@@ -45,7 +45,7 @@ struct ImageAryData
 
 struct ImplImageList
 {
-    typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
+    typedef std::unordered_map< OUString, ImageAryData * >
         ImageAryDataNameHash;
 
     std::vector<ImageAryData *>        maImages;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 8f4d3942a354..34cc99dd2f53 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -147,8 +147,7 @@ namespace framework
             void clear();
 
             typedef std::unordered_map< OUString,
-                                        sal_Bool,
-                                        OUStringHash > ImageNameMap;
+                                        sal_Bool > ImageNameMap;
 
             enum NotifyOp
             {
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 14c3d0905d1e..d10f944a876c 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -86,7 +86,7 @@ public:
 private:
     virtual void SAL_CALL disposing() final override;
 
-    typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash > ModuleToModuleCfgMgr;
+    typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 > > ModuleToModuleCfgMgr;
 
 //TODO_AS            void impl_initStorages();
 
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index fcde32765a42..12867b100403 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -170,7 +170,7 @@ private:
         css::uno::Reference< css::container::XIndexAccess > xSettings;
     };
 
-    typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
+    typedef std::unordered_map< OUString, UIElementData > UIElementDataHashMap;
 
     struct UIElementType
     {
@@ -187,7 +187,7 @@ private:
 
     typedef std::vector< UIElementType > UIElementTypesVector;
     typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
+    typedef std::unordered_map< OUString, UIElementInfo > UIElementInfoHashMap;
 
     void            impl_Initialize();
     void            implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 50ea375c93bd..d6712cbcf9be 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -86,8 +86,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
 
     private:
         typedef std::unordered_map< OUString,
-                                    OUString,
-                                    OUStringHash > IdToInfoCache;
+                                    OUString > IdToInfoCache;
 
         void initializeConfigAccess();
 
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 16a3ca5310cf..01c4becd60ff 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -151,7 +151,7 @@ private:
 
     struct UIElementType;
     friend struct UIElementType;
-    typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
+    typedef std::unordered_map< OUString, UIElementData > UIElementDataHashMap;
 
     struct UIElementType
     {
@@ -168,7 +168,7 @@ private:
 
     typedef std::vector< UIElementType > UIElementTypesVector;
     typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
+    typedef std::unordered_map< OUString, UIElementInfo > UIElementInfoHashMap;
 
     void            impl_Initialize();
     void            implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 99a6464c50e0..4cf804a2226f 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -199,8 +199,7 @@ class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper< XNameCon
 
     private:
         typedef std::unordered_map< OUString,
-                                    WindowStateInfo,
-                                    OUStringHash > ResourceURLToInfoCache;
+                                    WindowStateInfo > ResourceURLToInfoCache;
 
         osl::Mutex                        m_aMutex;
         OUString                          m_aConfigWindowAccess;
@@ -1265,12 +1264,10 @@ public:
     virtual sal_Bool SAL_CALL hasElements() override;
 
     typedef std::unordered_map< OUString,
-                                OUString,
-                                OUStringHash > ModuleToWindowStateFileMap;
+                                OUString > ModuleToWindowStateFileMap;
 
     typedef std::unordered_map< OUString,
-                                css::uno::Reference< css::container::XNameAccess >,
-                                OUStringHash > ModuleToWindowStateConfigHashMap;
+                                css::uno::Reference< css::container::XNameAccess > > ModuleToWindowStateConfigHashMap;
 
 private:
     css::uno::Reference< css::uno::XComponentContext>         m_xContext;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 5357e6955859..83282c2b0025 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -147,8 +147,7 @@ private:
     virtual void impl_setPopupMenu() override;
 
     class UrlToDispatchMap : public std::unordered_map< OUString,
-                                                        uno::Reference< frame::XDispatch >,
-                                                        OUStringHash >
+                                                        uno::Reference< frame::XDispatch > >
     {
         public:
             void free()
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index e004b693e388..dca1f9f52d6b 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -73,7 +73,7 @@ static const char STATIC_INTERNAL_CMD_PART[]    = ".cmd:";
 namespace framework
 {
 
-typedef std::unordered_map< OUString, OUString, OUStringHash > ToolbarHashMap;
+typedef std::unordered_map< OUString, OUString > ToolbarHashMap;
 
 struct ToolBarEntry
 {
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 62b1fa3b7198..8659c18dd3b4 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -126,8 +126,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
 
     private:
         typedef std::unordered_map< OUString,
-                                    CmdToInfoMap,
-                                    OUStringHash > CommandToInfoCache;
+                                    CmdToInfoMap > CommandToInfoCache;
 
         void initializeConfigAccess();
 
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index c57514cbd977..4755e37f8a15 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -46,7 +46,7 @@ struct theEmptyLocale : public rtl::Static< lang::Locale, theEmptyLocale > {};
 struct theEmptyBcp47 : public rtl::Static< OUString, theEmptyBcp47 > {};
 }
 
-typedef std::unordered_set< OUString, OUStringHash > KnownTagSet;
+typedef std::unordered_set< OUString > KnownTagSet;
 namespace {
 struct theKnowns : public rtl::Static< KnownTagSet, theKnowns > {};
 struct theMutex : public rtl::Static< osl::Mutex, theMutex > {};
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 1dc60cafbe69..7ecac0fd3fb7 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -101,7 +101,7 @@ protected:
         sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText);
 
 public:
-    typedef std::unordered_map< OString, std::shared_ptr< BI_ValueData >, OStringHash > BIMap;
+    typedef std::unordered_map< OString, std::shared_ptr< BI_ValueData > > BIMap;
 };
 
 }
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 437adfc4469c..fb3ba3227b28 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -46,7 +46,7 @@ public:
 class SvStringHashTable
 {
     std::unordered_map<sal_uInt32, std::unique_ptr<SvStringHashEntry>> maInt2EntryMap;
-    std::unordered_map<OString, sal_uInt32, OStringHash> maString2IntMap;
+    std::unordered_map<OString, sal_uInt32> maString2IntMap;
     sal_uInt32 mnNextId = 0;
 
 public:
diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index 4c30bcc40db8..6cd9080bce92 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -22,9 +22,7 @@
 
 #include <idlctypes.hxx>
 
-typedef std::unordered_map< OString,
-                         OString,
-                         OStringHash > OptionMap;
+typedef std::unordered_map< OString, OString > OptionMap;
 
 class IllegalArgument
 {
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index 00151e83e3c5..c2b6502e1d55 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -28,9 +28,9 @@
 #include <unordered_map>
 #include <vector>
 
-typedef std::unordered_map< OUString, OUString, OUStringHash > CodeCompleteVarTypes;
+typedef std::unordered_map< OUString, OUString > CodeCompleteVarTypes;
 /* variable name, type */
-typedef std::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > CodeCompleteVarScopes;
+typedef std::unordered_map< OUString, CodeCompleteVarTypes > CodeCompleteVarScopes;
 /* procedure, CodeCompleteVarTypes */
 
 class BASIC_DLLPUBLIC CodeCompleteOptions
diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index 21c9d0b1ba2a..e9859f37c999 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -61,7 +61,7 @@ private:
     GeneratedTypeSet(GeneratedTypeSet &) = delete;
     void operator =(const GeneratedTypeSet&) = delete;
 
-    std::unordered_set< OString, OStringHash > m_set;
+    std::unordered_set< OString > m_set;
 };
 
 }
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index da1dddf7e313..1e1374f317dc 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -44,11 +44,9 @@ namespace comphelper
 }
 
 typedef std::unordered_map < OUString,
-                        ::comphelper::PropertyInfo const *,
-                        OUStringHash > PropertyInfoHash;
+                        ::comphelper::PropertyInfo const * > PropertyInfoHash;
 typedef std::unordered_map < OUString,
-                        ::comphelper::PropertyData*,
-                        OUStringHash > PropertyDataHash;
+                        ::comphelper::PropertyData* > PropertyDataHash;
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index b4b2991948ae..35cdabc9aa76 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -40,7 +40,7 @@ namespace comphelper{
             such name sequences very easy ...
  */
 
-using SequenceAsHashMapBase = std::unordered_map<OUString, css::uno::Any, OUStringHash>;
+using SequenceAsHashMapBase = std::unordered_map<OUString, css::uno::Any>;
 
 class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap
 {
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 64e727bbab61..852e996dad79 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -66,8 +66,8 @@ struct FormulaArrayStack
 };
 
 
-typedef std::unordered_map< OUString, OpCode, OUStringHash > OpCodeHashMap;
-typedef std::unordered_map< OUString, OUString, OUStringHash > ExternalHashMap;
+typedef std::unordered_map< OUString, OpCode > OpCodeHashMap;
+typedef std::unordered_map< OUString, OUString > ExternalHashMap;
 
 class FORMULA_DLLPUBLIC FormulaCompiler
 {
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index c116250aa396..6ea56c3f48e2 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1912,6 +1912,27 @@ using ::rtl::OStringHash;
 using ::rtl::OStringLiteral;
 #endif
 
+/// @cond INTERNAL
+/**
+  Make OString hashable by default for use in STL containers.
+
+  @since LibreOffice 6.0
+*/
+#if defined LIBO_INTERNAL_ONLY
+namespace std {
+
+template<>
+struct hash<::rtl::OString>
+{
+    std::size_t operator()(::rtl::OString const & s) const
+    { return std::size_t(s.hashCode()); }
+};
+
+}
+
+#endif
+/// @endcond
+
 #endif // INCLUDED_RTL_STRING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index c6ce9a73eb99..96afdc438c83 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -3703,6 +3703,27 @@ using ::rtl::OUStringLiteral;
 using ::rtl::OUStringLiteral1;
 #endif
 
+/// @cond INTERNAL
+/**
+  Make OUString hashable by default for use in STL containers.
+
+  @since LibreOffice 6.0
+*/
+#if defined LIBO_INTERNAL_ONLY
+namespace std {
+
+template<>
+struct hash<::rtl::OUString>
+{
+    std::size_t operator()(::rtl::OUString const & s) const
+    { return std::size_t(s.hashCode()); }
+};
+
+}
+
+#endif
+/// @endcond
+
 #endif /* _RTL_USTRING_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index ba71420b9f92..31e9a3f3c4a1 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -189,7 +189,7 @@ private:
     bool mbIsHighContrastMode;
     bool mbIsHighContrastModeSetManually;
 
-    typedef std::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap;
+    typedef std::unordered_map<rtl::OUString,ThemeItem> PropertyNameToIdMap;
     PropertyNameToIdMap maPropertyNameToIdMap;
     typedef std::vector<rtl::OUString> PropertyIdToNameMap;
     PropertyIdToNameMap maPropertyIdToNameMap;
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index e6ae8d18730b..58b3c26a6d63 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -178,7 +178,7 @@ private:
      *
      * @internal
      * Must be an unordered map. A regular map is too slow for some files. */
-    typedef std::unordered_multimap<rtl::OUString, unsigned, rtl::OUStringHash> MapType;
+    typedef std::unordered_multimap<rtl::OUString, unsigned> MapType;
 
     /** A map which stores the positions of style sheets by their name */
     MapType mPositionsByName;
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 4b521e6e7c6e..f2d4d7594285 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -81,8 +81,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
         };
 
         typedef std::unordered_map< OUString,
-                                    css::uno::Reference< css::frame::XDispatch >,
-                                    OUStringHash > URLToDispatchMap;
+                                    css::uno::Reference< css::frame::XDispatch > > URLToDispatchMap;
 
         bool                                                      m_bDisposed : 1;
         css::uno::Reference< css::frame::XFrame >                 m_xFrame;
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index 2df6ac6f1de7..1def30e49f8c 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -101,8 +101,7 @@ class SVT_DLLPUBLIC StatusbarController :
         };
 
         typedef std::unordered_map< OUString,
-                                    css::uno::Reference< css::frame::XDispatch >,
-                                    OUStringHash > URLToDispatchMap;
+                                    css::uno::Reference< css::frame::XDispatch > > URLToDispatchMap;
 
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const OUString& aCommandURL );
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index a0f3c6bbc8d1..ce6079103c21 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -150,8 +150,7 @@ class SVT_DLLPUBLIC ToolboxController :
         DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, void );
 
         typedef std::unordered_map< OUString,
-                                    css::uno::Reference< css::frame::XDispatch >,
-                                    OUStringHash > URLToDispatchMap;
+                                    css::uno::Reference< css::frame::XDispatch > > URLToDispatchMap;
 
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const OUString& aCommandURL );
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index 9a62f6141e38..53bcd538b836 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -167,8 +167,7 @@ private:
     /** This hash map allows the fast look up of a type descriptor for a
         given service name.
     */
-    typedef std::unordered_map<OUString,ShapeTypeId,
-                               OUStringHash> tServiceNameToSlotId;
+    typedef std::unordered_map<OUString,ShapeTypeId> tServiceNameToSlotId;
     mutable tServiceNameToSlotId maServiceNameToSlotId;
 
     /**  Determine the slot id of the specified shape type.  With this id
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 8bf5eab3e8b9..3af42c9c19ba 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -41,7 +41,7 @@ private:
         size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const;
     };
     typedef std::unordered_map <PropertyPair, sal_Int32, PropertyPairHash> PropertyPairHashMap;
-    typedef std::unordered_map<OUString, sal_Int32, OUStringHash> PropertyHashMap;
+    typedef std::unordered_map<OUString, sal_Int32> PropertyHashMap;
 
     PropertyHashMap     aPropHashMap;
     PropertyPairHashMap aPropPairHashMap;
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 859b06ee45a3..65d0418bdc27 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -36,7 +36,7 @@ class ScriptEventContainer : public ::cppu::WeakImplHelper<
                                         css::container::XNameContainer,
                                         css::container::XContainer >
 {
-    std::unordered_map< OUString, css::uno::Any, OUStringHash>
+    std::unordered_map< OUString, css::uno::Any>
                    mHashMap;
     css::uno::Type mType;
 
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 1c51a4f6a382..75af8b41f1d3 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -71,7 +71,7 @@ struct INetContentTypeParameter
     there will only be one item for the complete parameter, with the attribute
     name lacking any section suffix.
  */
-typedef std::unordered_map<OString, INetContentTypeParameter, OStringHash>
+typedef std::unordered_map<OString, INetContentTypeParameter>
     INetContentTypeParameterList;
 
 
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index 4b388b79ed79..98aa19676294 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -108,7 +108,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
         mutable css::uno::Reference< css::container::XNameAccess > xAccess;
     };
 
-    std::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig;
+    std::unordered_map< OUString, LocaleAccess > m_aConfig;
 
     OUString tryLocale( const OUString& rBcp47, const OUString& rType ) const;
 
@@ -153,8 +153,8 @@ private:
 
         LocaleSubst() : bConfigRead( false ) {}
     };
-    std::unordered_map< OUString, LocaleSubst, OUStringHash > m_aSubst;
-    typedef std::unordered_set< OUString, OUStringHash > UniqueSubstHash;
+    std::unordered_map< OUString, LocaleSubst > m_aSubst;
+    typedef std::unordered_set< OUString > UniqueSubstHash;
     mutable UniqueSubstHash maSubstHash;
 
     void fillSubstVector( const css::uno::Reference< css::container::XNameAccess >& rFont,
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index b5c09d83d37f..042ad7439b8f 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -216,7 +216,7 @@ protected:
 
 private:
     typedef std::map< sal_Int32, EventHandlerInfo > EventHandlerInfoMap;
-    typedef std::unordered_map< OUString, ModulePathMap, OUStringHash > EventHandlerPathMap;
+    typedef std::unordered_map< OUString, ModulePathMap > EventHandlerPathMap;
 
     EventHandlerInfoMap maEventInfos;
     EventHandlerPathMap maEventPaths;
diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx
index 39824188b9b9..50bba28396a0 100644
--- a/include/vcl/configsettings.hxx
+++ b/include/vcl/configsettings.hxx
@@ -28,7 +28,7 @@
 
 namespace vcl
 {
-    typedef std::unordered_map< OUString, OUString, OUStringHash > OUStrMap;
+    typedef std::unordered_map< OUString, OUString > OUStrMap;
     class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} };
 
 
@@ -37,7 +37,7 @@ namespace vcl
     class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem
     {
     private:
-        std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings;
+        std::unordered_map< OUString, SmallOUStrMap > m_aSettings;
 
         virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override;
 
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 227c617961d2..a3a04b86fdff 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -61,7 +61,7 @@ class VCL_DLLPUBLIC PPDKey
     friend class PPDParser;
     friend class CPDManager;
 
-    typedef std::unordered_map< OUString, PPDValue, OUStringHash > hash_type;
+    typedef std::unordered_map< OUString, PPDValue > hash_type;
     typedef std::vector< PPDValue* > value_type;
 
     OUString            m_aKey;
@@ -123,7 +123,7 @@ class VCL_DLLPUBLIC PPDParser
     friend class CPDManager;
     friend class PPDCache;
 
-    typedef std::unordered_map< OUString, PPDKey*, OUStringHash > hash_type;
+    typedef std::unordered_map< OUString, PPDKey* > hash_type;
     typedef std::vector< PPDKey* > value_type;
 
     void insertKey( const OUString& rKey, PPDKey* pKey );
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 94e5b9dd6ba0..e25eaa5dd044 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -566,7 +566,7 @@ public:
 class VCL_DLLPUBLIC PrinterOptionsHelper
 {
 protected:
-    std::unordered_map< OUString, css::uno::Any, OUStringHash >
+    std::unordered_map< OUString, css::uno::Any >
                          m_aPropertyMap;
     std::vector< css::beans::PropertyValue >
                          m_aUIProperties;
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index 7dd1c002d9fc..f14c82200081 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -61,7 +61,7 @@ struct QNamePairHash
 };
 
 typedef std::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache;
-typedef std::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry >, OUStringHash > NameSpaceHash;
+typedef std::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry > > NameSpaceHash;
 typedef std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry > > NameSpaceMap;
 
 class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 636e4042f1e6..1fbda3c11f77 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
 } } }
 
-typedef std::unordered_set<OUString, OUStringHash> OldFillStyleDefinitionSet;
+typedef std::unordered_set<OUString> OldFillStyleDefinitionSet;
 
 class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
 {
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 6ebd75998aaf..f1d993dd62d0 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -28,7 +28,7 @@
 #include <vector>
 #include "po.hxx"
 
-typedef std::unordered_map<OString, OString, OStringHash> OStringHashMap;
+typedef std::unordered_map<OString, OString> OStringHashMap;
 
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list