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 /svgio | |
| 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 'svgio')
| -rw-r--r-- | svgio/inc/svgdocument.hxx | 5 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgtoken.cxx | 2 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgtools.cxx | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/svgio/inc/svgdocument.hxx b/svgio/inc/svgdocument.hxx index 687fc494c2c3..979b466c8206 100644 --- a/svgio/inc/svgdocument.hxx +++ b/svgio/inc/svgdocument.hxx @@ -37,13 +37,12 @@ namespace svgio const OUString maAbsolutePath; /// hash mapper to find nodes by their id - typedef std::unordered_map< OUString, const SvgNode*, - OUStringHash > IdTokenMapper; + typedef std::unordered_map< OUString, const SvgNode* > IdTokenMapper; typedef std::pair< const OUString, const SvgNode* > IdTokenValueType; IdTokenMapper maIdTokenMapperList; /// hash mapper to find css styles by their id - typedef std::unordered_map< OUString, const SvgStyleAttributes*, OUStringHash > IdStyleTokenMapper; + typedef std::unordered_map< OUString, const SvgStyleAttributes* > IdStyleTokenMapper; typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType; IdStyleTokenMapper maIdStyleTokenMapperList; diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index af1970b51e8a..4416d32c1de9 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -167,7 +167,7 @@ namespace svgio SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent) { - typedef std::unordered_map< OUString, SVGToken, OUStringHash > SVGTokenMapper; + typedef std::unordered_map< OUString, SVGToken > SVGTokenMapper; typedef std::pair< OUString, SVGToken > SVGTokenValueType; static SVGTokenMapper aSVGTokenMapperList; diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index d5477d82c8a2..a0024730f89a 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -631,8 +631,7 @@ namespace svgio bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent) { - typedef std::unordered_map< OUString, Color, - OUStringHash > ColorTokenMapper; + typedef std::unordered_map< OUString, Color > ColorTokenMapper; typedef std::pair< OUString, Color > ColorTokenValueType; ColorTokenMapper aColorTokenMapperList; |