From 22f2cf3ccc6d0c9ba2c2860735e789d6b3a25f72 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 29 Apr 2019 16:24:12 +0200 Subject: implement std::hash for css::uno::Reference and rtl::Reference The declaration in BarChart.cxx is particularly suspicious, because it was using a < for the KeyEqual template parameter. Been there since: commit b2c3233e5f267b5d244d722a94424a3b224b3314 Date: Thu Dec 21 20:08:33 2017 +0900 chart2: suspend/resume setting rects dirty for 3D shapes comphelper::OInterfaceCompare is no longer necessary Change-Id: I8278c4a3d9113a18570ca237cd05d553ec8f3975 Reviewed-on: https://gerrit.libreoffice.org/71537 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/svg/svgfilter.hxx | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'filter') diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 82a5b8cc291c..c4b31eef77a7 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -147,14 +147,6 @@ struct PagePropertySet } }; -struct HashReferenceXInterface -{ - size_t operator()( const Reference< XInterface >& rxIf ) const - { - return reinterpret_cast< size_t >( rxIf.get() ); - } -}; - struct HashUChar { size_t operator()( const sal_Unicode uchar ) const { return static_cast< size_t >( uchar ); } @@ -181,16 +173,16 @@ class SVGFilter : public cppu::WeakImplHelper < XFilter, XExtendedFilterDetection > { public: - typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; - typedef std::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; + typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation > ObjectMap; + typedef std::unordered_set< Reference< XInterface > > ObjectSet; - typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef std::unordered_map< OUString, UCharSet > UCharSetMap; - typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; + typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet; + typedef std::unordered_map< OUString, UCharSet > UCharSetMap; + typedef std::unordered_map< Reference< XInterface >, UCharSetMap > UCharSetMapMap; - typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; + typedef std::unordered_map< Reference< XInterface >, OUString > UOStringMap; - typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; + typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; private: -- cgit v1.2.3