Get rid of unnecessary comphelper::UStringEqual

Change-Id: Ia8718e49f21ccec239b2769eafa6bef90e0e9e40

14 files changed, 16 insertions, 42 deletions

diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 695e518f97cc..b8548d462403 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 
 #include <boost/unordered_map.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/container/XNameReplace.hpp>
@@ -74,7 +73,7 @@ namespace frm
     };
 
 typedef ::std::vector<InterfaceRef> OInterfaceArray;
-typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash, ::comphelper::UStringEqual> OInterfaceMap;
+typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap;
 
 //==================================================================
 // OInterfaceContainer
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 8ed702abc25a..134564c385b9 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -56,11 +56,6 @@ public:
 
     bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
-//------------------------------------------------------------------------
-struct UStringEqual
-{
-    sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equals( rhs );}
-};
 
 //------------------------------------------------------------------------
 struct UStringIEqual
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index 0b5e30019e24..7a3729711d91 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <svx/svxdllapi.h>
 
@@ -187,8 +186,7 @@ private:
     */
     typedef ::boost::unordered_map<
         OUString,ShapeTypeId,
-        OUStringHash,
-        ::comphelper::UStringEqual> tServiceNameToSlotId;
+        OUStringHash> tServiceNameToSlotId;
     mutable tServiceNameToSlotId maServiceNameToSlotId;
 
     /**  Determine the slot id of the specified shape type.  With this id
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index d4f5e180c067..e3b53130bd8f 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -20,7 +20,6 @@
 #include "oox/drawingml/customshapegeometry.hxx"
 
 #include <com/sun/star/xml/sax/FastToken.hpp>
-#include <comphelper/stl_types.hxx>
 #include <boost/unordered_map.hpp>
 #include "oox/helper/helper.hxx"
 #include "oox/helper/attributelist.hxx"
@@ -83,7 +82,7 @@ static const FormularCommandNameTable pFormularCommandNameTable[] =
     { "val",    FC_VAL }
 
 };
-typedef boost::unordered_map< OUString, FormularCommand, OUStringHash, comphelper::UStringEqual > FormulaCommandHMap;
+typedef boost::unordered_map< OUString, FormularCommand, OUStringHash > FormulaCommandHMap;
 
 static const FormulaCommandHMap* pCommandHashMap;
 
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 4617e13e3582..1d8b98df623d 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -24,15 +24,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <CustomAnimationEffect.hxx>
 
 #include <boost/unordered_map.hpp>
 
 namespace sd {
 
-typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
-typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
 typedef std::vector< OUString > UStringList;
 
 class CustomAnimationPreset
@@ -71,7 +70,7 @@ private:
 };
 
 typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash, comphelper::UStringEqual> EffectDescriptorMap;
+typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
 typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
 
 struct PresetCategory
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 6769dc9b5486..a09504088cd3 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -23,8 +23,6 @@
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <comphelper/stl_types.hxx>
-
 #include <list>
 #include <boost/unordered_map.hpp>
 
@@ -40,7 +38,7 @@ namespace sd {
 class TransitionPreset;
 typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
 typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
 
 class TransitionPreset
 {
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 3392bc960578..4efbd3b47f0e 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -24,7 +24,6 @@
 #include <oox/helper/zipstorage.hxx>
 #include <oox/vml/vmldrawing.hxx>
 #include <oox/export/shapes.hxx>
-#include <comphelper/stl_types.hxx>
 #include "epptbase.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -156,7 +155,7 @@ private:
         sal_Int32 nId;
         sal_Int32 nLastIndex;
     };
-    typedef ::boost::unordered_map< OUString, struct AuthorComments, OUStringHash, comphelper::UStringEqual > AuthorsMap;
+    typedef ::boost::unordered_map< OUString, struct AuthorComments, OUStringHash > AuthorsMap;
     AuthorsMap maAuthors;
 
     void WriteAuthors();
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 49bdfefec1f4..ec2886e8eee7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <vector>
 #include <boost/unordered_map.hpp>
 
@@ -119,8 +118,7 @@ private:
     typedef ::boost::unordered_map
         <OUString,
          ListenerList,
-         OUStringHash,
-         ::comphelper::UStringEqual> ListenerMap;
+         OUStringHash> ListenerMap;
     ListenerMap maListenerMap;
 
     /** Broadcast the given event to all listeners in the given list.
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 2f9f8fa75ba2..2c22df2a67e5 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 #include <boost/unordered_map.hpp>
 
 namespace sd { namespace framework {
@@ -86,8 +85,7 @@ private:
     typedef ::boost::unordered_map<
         OUString,
         css::uno::Reference<css::drawing::framework::XResourceFactory>,
-        OUStringHash,
-        ::comphelper::UStringEqual> FactoryMap;
+        OUStringHash> FactoryMap;
     FactoryMap maFactoryMap;
 
     typedef ::std::vector<
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 1406d6e14d5a..983c93d0dd1e 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -22,7 +22,6 @@
 
 #include "tools/ConfigurationAccess.hxx"
 #include <comphelper/processfactory.hxx>
-#include <comphelper/stl_types.hxx>
 #include <boost/bind.hpp>
 #include <boost/unordered_map.hpp>
 
@@ -45,8 +44,7 @@ class ModuleController::ResourceToFactoryMap
     : public ::boost::unordered_map<
     OUString,
     OUString,
-    OUStringHash,
-    ::comphelper::UStringEqual>
+    OUStringHash>
 {
 public:
     ResourceToFactoryMap (void) {}
@@ -57,8 +55,7 @@ class ModuleController::LoadedFactoryContainer
     : public ::boost::unordered_map<
     OUString,
     WeakReference<XInterface>,
-    OUStringHash,
-    ::comphelper::UStringEqual>
+    OUStringHash>
 {
 public:
     LoadedFactoryContainer (void) {}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index f2680b2739e7..5596e49bda08 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/compbase1.hxx>
 #include <svl/lstner.hxx>
 
-#include <comphelper/stl_types.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 
@@ -291,8 +290,7 @@ class FrameworkHelper::ViewURLMap
     : public ::boost::unordered_map<
           OUString,
           ViewShell::ShellType,
-          OUStringHash,
-          ::comphelper::UStringEqual>
+          OUStringHash>
 {
 public:
     ViewURLMap (void) {}
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index df50159dc2e7..9b533eafb6cf 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -29,7 +29,6 @@
 
 #include <string.h>
 
-#include <comphelper/stl_types.hxx>
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 
@@ -232,7 +231,7 @@ enum FactoryId
     SlideLayoutControllerFactoryId,
     InsertSlideControllerFactoryId,
 };
-typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash, comphelper::UStringEqual> FactoryMap;
+typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
 
 
 namespace {
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index f793ce973f46..3c2a026252fe 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -25,7 +25,6 @@
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
 #include "TransformerBase.hxx"
-#include <comphelper/stl_types.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <boost/unordered_map.hpp>
@@ -35,8 +34,7 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::xmloff::token;
 
 class XMLTransformerOOoEventMap_Impl:
-    public ::boost::unordered_map< OUString, NameKey_Impl,
-                            OUStringHash, ::comphelper::UStringEqual >
+    public ::boost::unordered_map< OUString, NameKey_Impl, OUStringHash >
 {
 public:
 
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index ca8c43c52360..ec4cf09e69d5 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
 
 #include <rtl/ustring.hxx>
-#include <comphelper/stl_types.hxx>
 #include <boost/unordered_map.hpp>
 #include <xmloff/xmltoken.hxx>
 #include "TransformerTokenMap.hxx"
@@ -30,7 +29,7 @@
 
 class XMLTransformerTokenMap :
     public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum,
-                            OUStringHash, ::comphelper::UStringEqual >
+                                   OUStringHash >
 {
 public:
     XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit );