diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-19 17:18:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-23 08:15:35 +0200 |
commit | 87a9979c8938b800aab6e35903d60d24892e7f2e (patch) | |
tree | 6beb01f22537e63df24c023ab65d391a7bee0cf6 /unotools/source/config | |
parent | d76c4e5c9aaf8bd27ec97679bcaeba5b18aca493 (diff) |
overload std::hash for OUString and OString
no need to explicitly specify it anymore
Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec
Reviewed-on: https://gerrit.libreoffice.org/43567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/cmdoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/eventcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fontcfg.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/optionsdlg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 5f1eac638403..e7cebb526beb 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -78,7 +78,7 @@ class SvtCmdOptions } private: - typedef std::unordered_map<OUString, sal_Int32, OUStringHash> + typedef std::unordered_map<OUString, sal_Int32> CommandHashMap; CommandHashMap m_aCommandHashMap; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 2f2f57956a5e..2a8dc2034822 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -76,7 +76,7 @@ static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames = "OnStorageChanged" }; -typedef std::unordered_map< OUString, OUString, OUStringHash > EventBindingHash; +typedef std::unordered_map< OUString, OUString > EventBindingHash; typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector; typedef o3tl::enumarray< GlobalEventId, OUString > SupportedEventsVector; diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 7a9630595189..46841d3dad01 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno; #define PROPERTYCOUNT 1 -typedef std::unordered_map<OUString, sal_Int32, OUStringHash> +typedef std::unordered_map<OUString, sal_Int32> ExtensionHashMap; class SvtExtendedSecurityOptions_Impl : public ConfigItem diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index e09a03f058a2..91aa70272eff 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -151,7 +151,7 @@ OUString DefaultFontConfiguration::tryLocale( const OUString& rBcp47, const OUSt { OUString aRet; - std::unordered_map< OUString, LocaleAccess, OUStringHash >::const_iterator it = m_aConfig.find( rBcp47 ); + std::unordered_map< OUString, LocaleAccess >::const_iterator it = m_aConfig.find( rBcp47 ); if( it != m_aConfig.end() ) { if( !it->second.xAccess.is() ) @@ -992,7 +992,7 @@ ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference< X void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const { - std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator it = m_aSubst.find( rBcp47 ); + std::unordered_map< OUString, LocaleSubst >::const_iterator it = m_aSubst.find( rBcp47 ); if( it != m_aSubst.end() ) { if( ! it->second.bConfigRead ) @@ -1088,7 +1088,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN for (::std::vector< OUString >::const_iterator fb( aFallbacks.begin()); fb != aFallbacks.end(); ++fb) { - std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator lang = m_aSubst.find( *fb ); + std::unordered_map< OUString, LocaleSubst >::const_iterator lang = m_aSubst.find( *fb ); if( lang != m_aSubst.end() ) { if( ! lang->second.bConfigRead ) diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index 7da3f2305455..b0a053e1fc93 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -43,7 +43,7 @@ static sal_Int32 nRefCount = 0; class SvtOptionsDlgOptions_Impl : public utl::ConfigItem { private: - typedef std::unordered_map< OUString, sal_Bool, OUStringHash > OptionNodeList; + typedef std::unordered_map< OUString, sal_Bool > OptionNodeList; OUString m_sPathDelimiter; OptionNodeList m_aOptionNodeList; diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 634fa2639015..09d1df3beb86 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -70,7 +70,7 @@ using namespace com::sun::star::lang; #define STRPOS_NOTFOUND -1 -typedef std::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap; +typedef std::unordered_map<OUString, sal_Int32> NameToHandleMap; typedef std::set<OUString> VarNameSet; |