diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-29 16:24:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-30 08:43:04 +0200 |
commit | 22f2cf3ccc6d0c9ba2c2860735e789d6b3a25f72 (patch) | |
tree | f20474881dd71d3f815a964718a3b7dbcc53340a /svx | |
parent | f9f7cc62e95f12a9d4ea02413a658d40e09ccde6 (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 'svx')
-rw-r--r-- | svx/source/form/fmpgeimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 3 | ||||
-rw-r--r-- | svx/source/inc/fmcontrolbordermanager.hxx | 4 | ||||
-rw-r--r-- | svx/source/inc/fmvwimp.hxx | 10 | ||||
-rw-r--r-- | svx/source/table/accessibletableshape.cxx | 10 |
5 files changed, 6 insertions, 23 deletions
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 8ca89e14aab7..8002617b9a29 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -118,7 +118,7 @@ namespace } }; - typedef ::std::map< Reference< XControlModel >, Reference< XControlModel >, ::comphelper::OInterfaceCompare< XControlModel > > MapControlModels; + typedef ::std::map< Reference< XControlModel >, Reference< XControlModel > > MapControlModels; class FormComponentAssignment { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 244b9d5b5407..cd641a0bd9de 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -86,8 +86,7 @@ namespace svxform // helper - typedef ::std::map< Reference< XInterface >, SdrObject*, ::comphelper::OInterfaceCompare< XInterface > > - MapModelToShape; + typedef ::std::map< Reference< XInterface >, SdrObject* > MapModelToShape; static void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping ) diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 9375d02934a5..5b12dbc4d50f 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> -#include <comphelper/stl_types.hxx> #include <o3tl/typed_flags_set.hxx> #include <tools/color.hxx> @@ -111,8 +110,7 @@ namespace svxform }; typedef ::std::set< ControlData, ControlDataCompare > ControlBag; - typedef ::std::set< css::uno::Reference< css::awt::XVclWindowPeer >, - ::comphelper::OInterfaceCompare< css::awt::XVclWindowPeer > > PeerBag; + typedef ::std::set< css::uno::Reference< css::awt::XVclWindowPeer > > PeerBag; PeerBag m_aColorableControls; PeerBag m_aNonColorableControls; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 59f8647b102e..5696e8291f33 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -41,7 +41,6 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/stl_types.hxx> #include <tools/link.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> @@ -130,13 +129,8 @@ private: typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; typedef ::std::vector< PFormViewPageWindowAdapter > PageWindowAdapterList; -typedef ::std::set < css::uno::Reference< css::form::XForm > - , ::comphelper::OInterfaceCompare< css::form::XForm > - > SetOfForms; -typedef ::std::map < css::uno::Reference< css::awt::XControlContainer > - , SetOfForms - , ::comphelper::OInterfaceCompare< css::awt::XControlContainer > - > MapControlContainerToSetOfForms; +typedef ::std::set< css::uno::Reference< css::form::XForm > > SetOfForms; +typedef ::std::map< css::uno::Reference< css::awt::XControlContainer >, SetOfForms > MapControlContainerToSetOfForms; class SdrModel; class FmXFormView : public ::cppu::WeakImplHelper< diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index dd88dd45cf9d..62b211b8992a 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -51,15 +51,7 @@ using namespace ::com::sun::star::container; namespace accessibility { -struct hash -{ - std::size_t operator()( const Reference< XCell >& xCell ) const - { - return std::size_t( xCell.get() ); - } -}; - -typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; +typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell > > AccessibleCellMap; class AccessibleTableShapeImpl : public cppu::WeakImplHelper< XModifyListener > { |