From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Oct 2017 17:18:17 +0200 Subject: 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 Reviewed-by: Noel Grandin --- xmloff/source/draw/ximpcustomshape.cxx | 2 +- xmloff/source/forms/property_meta_data.cxx | 4 ++-- xmloff/source/transform/EventOOoTContext.cxx | 2 +- xmloff/source/transform/TransformerTokenMap.hxx | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 5f6ae87e1358..f85c74fdd507 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1144,7 +1144,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rP } } -typedef std::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap; +typedef std::unordered_map< OUString, sal_Int32 > EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from OUString to index */ diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index e1946bcc8429..3e4977cd3090 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -68,7 +68,7 @@ namespace xmloff { namespace metadata // one big instance, since in this case, every instance can quickly decide whether it is responsible // for some attribute or property, and otherwise delegate to the next instance. - typedef std::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; + typedef std::unordered_map< OUString, const PropertyDescription* > DescriptionsByName; const DescriptionsByName& lcl_getPropertyDescriptions() { @@ -105,7 +105,7 @@ namespace xmloff { namespace metadata return s_indexedPropertyGroups; } - typedef std::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; + typedef std::unordered_map< OUString, XMLTokenEnum > ReverseTokenLookup; const ReverseTokenLookup& getReverseTokenLookup() { diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 59bbfb1657fb..7b0af9b7fd8b 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public std::unordered_map< OUString, NameKey_Impl, OUStringHash > + public std::unordered_map< OUString, NameKey_Impl > { public: diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 0379ed544d64..047d8ba96ad0 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -25,8 +25,7 @@ #include class XMLTransformerTokenMap : - public std::unordered_map< OUString, ::xmloff::token::XMLTokenEnum, - OUStringHash > + public std::unordered_map< OUString, ::xmloff::token::XMLTokenEnum > { public: explicit XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit ); -- cgit