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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/config/cache/cacheitem.hxx | 10 | ||||
| -rw-r--r-- | filter/source/config/cache/querytokenizer.hxx | 4 | ||||
| -rw-r--r-- | filter/source/svg/svgfilter.hxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.hxx | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index e1b2dcd2a02f..b798f2d6cee7 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -146,9 +146,8 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef std::unordered_map< OUString , - CacheItem , - OUStringHash > CacheItemList; +typedef std::unordered_map< OUString, + CacheItem > CacheItemList; /** @short supports registration of multiple key to @@ -163,9 +162,8 @@ typedef std::unordered_map< OUString , there we need key-value pairs too, which can't be provided by a pure vector! */ -typedef std::unordered_map< OUString , - OUStringList , - OUStringHash > CacheItemRegistration; +typedef std::unordered_map< OUString, + OUStringList > CacheItemRegistration; /** @short is used to collect all matching types of an URL diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index b6147ac00e1c..149ddba60552 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -45,9 +45,7 @@ namespace filter{ @attention This class is not threadsafe implemented. Because it's not necessary. But you have to make sure that it's not used as such :-) */ -class QueryTokenizer : public std::unordered_map< OUString , - OUString , - OUStringHash > +class QueryTokenizer : public std::unordered_map< OUString, OUString > { // member diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 34b7b20a47c1..e9e8fad10a85 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -187,7 +187,7 @@ public: typedef Sequence< Reference< XInterface > > ObjectSequence; typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef std::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap; + typedef std::unordered_map< OUString, UCharSet > UCharSetMap; typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 46fced788f72..fbfe54bfe475 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -217,7 +217,7 @@ struct BulletListItemInfo class SVGTextWriter final { public: - typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap; + typedef std::unordered_map< OUString, BulletListItemInfo > BulletListItemInfoMap; private: SVGExport& mrExport; |