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 /sw/source/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 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 0140b5855b18..8be9b2d1ca44 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -318,7 +318,7 @@ void MSWordStyles::BuildStylesTable() void MSWordStyles::BuildStyleIds() { - std::unordered_set<OString, OStringHash> aUsed; + std::unordered_set<OString> aUsed; m_aStyleIds.emplace_back("Normal"); aUsed.insert("normal"); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index d266fac6c5d5..949585384d31 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1065,9 +1065,9 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xInfo.is() ) return; - std::unordered_set< OUString, OUStringHash > aExcludeAlways; + std::unordered_set< OUString > aExcludeAlways; aExcludeAlways.insert("LinkUpdateMode"); - std::unordered_set< OUString, OUStringHash > aExcludeWhenNotLoadingUserSettings; + std::unordered_set< OUString > aExcludeWhenNotLoadingUserSettings; aExcludeWhenNotLoadingUserSettings.insert("ForbiddenCharacters"); aExcludeWhenNotLoadingUserSettings.insert("IsKernAsianPunctuation"); aExcludeWhenNotLoadingUserSettings.insert("CharacterCompressionType"); |