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/inc/accelerators | |
| 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/inc/accelerators')
| -rw-r--r-- | framework/source/inc/accelerators/acceleratorcache.hxx | 2 | ||||
| -rw-r--r-- | framework/source/inc/accelerators/keymapping.hxx | 2 | ||||
| -rw-r--r-- | framework/source/inc/accelerators/storageholder.hxx | 5 |
3 files changed, 4 insertions, 5 deletions
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: |