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 >
 {