From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Oct 2017 17:18:17 +0200 Subject: 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 Reviewed-by: Noel Grandin --- sd/inc/CustomAnimationPreset.hxx | 6 +++--- sd/inc/TransitionPreset.hxx | 2 +- sd/source/filter/eppt/epptooxml.hxx | 2 +- .../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 +- 9 files changed, 12 insertions(+), 17 deletions(-) (limited to 'sd') diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index 530a6e7a990c..2eddec29e91e 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -33,8 +33,8 @@ namespace sd { -typedef std::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap; -typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap; +typedef std::unordered_map< OUString, CustomAnimationEffectPtr > EffectsSubTypeMap; +typedef std::unordered_map< OUString, OUString > UStringMap; typedef std::vector< OUString > UStringList; class CustomAnimationPreset @@ -70,7 +70,7 @@ private: }; typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr; -typedef std::unordered_map EffectDescriptorMap; +typedef std::unordered_map EffectDescriptorMap; typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList; struct PresetCategory diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index 922901c4d1d0..623989f8e93a 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -38,7 +38,7 @@ namespace sd { class TransitionPreset; typedef std::shared_ptr< TransitionPreset > TransitionPresetPtr; typedef std::list< TransitionPresetPtr > TransitionPresetList; -typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap; +typedef std::unordered_map< OUString, OUString > UStringMap; class TransitionPreset { diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 05a9bd2d3bbc..91880a709b7d 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -158,7 +158,7 @@ private: sal_Int32 nId; sal_Int32 nLastIndex; }; - typedef std::unordered_map< OUString, struct AuthorComments, OUStringHash > AuthorsMap; + typedef std::unordered_map< OUString, struct AuthorComments > AuthorsMap; AuthorsMap maAuthors; void WriteAuthors(); diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index ac4807a59abb..45b7d05fe5c2 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -117,8 +117,7 @@ private: typedef std::vector ListenerList; typedef std::unordered_map ListenerMap; + ListenerList> ListenerMap; ListenerMap maListenerMap; /** Broadcast the given event to all listeners in the given list. diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index ed0370107d98..34ee07446d9e 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -89,8 +89,7 @@ private: ::osl::Mutex maMutex; typedef std::unordered_map< OUString, - css::uno::Reference, - OUStringHash> FactoryMap; + css::uno::Reference > FactoryMap; FactoryMap maFactoryMap; typedef ::std::vector< diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 564354cbc34d..c64b5a704bba 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -40,8 +40,7 @@ static const sal_uInt32 snStartupPropertyCount (1); class ModuleController::ResourceToFactoryMap : public std::unordered_map< OUString, - OUString, - OUStringHash> + OUString> { public: ResourceToFactoryMap() {} @@ -50,8 +49,7 @@ public: class ModuleController::LoadedFactoryContainer : public std::unordered_map< OUString, - WeakReference, - OUStringHash> + WeakReference> { public: LoadedFactoryContainer() {} diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index ed25bcc026f5..ed1e2aa93fc7 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -272,8 +272,7 @@ namespace class FrameworkHelper::ViewURLMap : public std::unordered_map< OUString, - ViewShell::ShellType, - OUStringHash> + ViewShell::ShellType> { public: ViewURLMap() {} diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 6e05720b6b4c..703dc28cd6f9 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -40,7 +40,7 @@ private: */ static IconCache* s_pIconCache; - typedef std::unordered_map ImageContainer; + typedef std::unordered_map ImageContainer; ImageContainer maContainer; Image GetIcon(const OUString& rResourceId); diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 585e37f5e23f..39889015d995 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -40,7 +40,7 @@ enum FactoryId SdDrawingDocumentFactoryId, SdPresentationDocumentFactoryId, }; -typedef std::unordered_map FactoryMap; +typedef std::unordered_map FactoryMap; namespace { static std::shared_ptr spFactoryMap; -- cgit