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 /framework/source/uiconfiguration | |
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 'framework/source/uiconfiguration')
8 files changed, 12 insertions, 17 deletions
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; |