summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-12-06 13:34:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-12-06 14:28:36 +0100
commite9c62a2d9cdca2c42badb468712d1c5be8326444 (patch)
treeac20b1cdd066d27ce50d13b6e4baf83581f52dc9 /sd/inc
parent57b15f2dcd2963808b8af3f0665450ef81bb3eb8 (diff)
Get rid of unnecessary comphelper::UStringEqual
Change-Id: Ia8718e49f21ccec239b2769eafa6bef90e0e9e40
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationPreset.hxx7
-rw-r--r--sd/inc/TransitionPreset.hxx4
2 files changed, 4 insertions, 7 deletions
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
{