summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-04-29 16:24:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-30 08:43:04 +0200
commit22f2cf3ccc6d0c9ba2c2860735e789d6b3a25f72 (patch)
treef20474881dd71d3f815a964718a3b7dbcc53340a /include/oox
parentf9f7cc62e95f12a9d4ea02413a658d40e09ccde6 (diff)
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/export/shapes.hxx14
1 files changed, 1 insertions, 13 deletions
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index b7755ccee9d2..a8ea2d5c6005 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -82,21 +82,9 @@ class OOX_DLLPUBLIC ShapeExport : public DrawingML {
private:
int m_nEmbeddedObjects;
- struct ShapeCheck
- {
- bool operator()( const css::uno::Reference< css::drawing::XShape>& s1, const css::uno::Reference< css::drawing::XShape>& s2 ) const
- {
- return s1 == s2;
- }
- };
-
- struct ShapeHash
- {
- size_t operator()( const css::uno::Reference < css::drawing::XShape >& ) const;
- };
public:
- typedef std::unordered_map< css::uno::Reference< css::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap;
+ typedef std::unordered_map< css::uno::Reference< css::drawing::XShape>, sal_Int32> ShapeHashMap;
protected:
sal_Int32 mnShapeIdMax, mnPictureIdMax;