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 /sd/inc | |
| 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 'sd/inc')
| -rw-r--r-- | sd/inc/CustomAnimationPreset.hxx | 6 | ||||
| -rw-r--r-- | sd/inc/TransitionPreset.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
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<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap; +typedef std::unordered_map<OUString, CustomAnimationPresetPtr> 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 { |