[Libreoffice-commits] .: sd/inc sd/source

[Kohei Yoshida]

 sd/inc/CustomAnimationPreset.hxx                                            |    6 +++---
 sd/inc/TransitionPreset.hxx                                                 |    2 +-
 sd/source/filter/eppt/epptooxml.hxx                                         |    2 +-
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx |    2 +-
 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx             |    2 +-
 sd/source/ui/framework/module/ModuleController.cxx                          |    4 ++--
 sd/source/ui/framework/tools/FrameworkHelper.cxx                            |    2 +-
 sd/source/ui/unoidl/facreg.cxx                                              |    2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 95e91860dec722f852dbb4ca4ba9cda2c7e20721
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Thu Aug 4 21:35:57 2011 -0400

    Use rtl::OUStringHash.

diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index fb2a7b7..41adba6 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -40,8 +40,8 @@
 
 namespace sd {
 
-typedef boost::unordered_map< rtl::OUString, CustomAnimationEffectPtr, comphelper::UStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
-typedef boost::unordered_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< rtl::OUString, CustomAnimationEffectPtr, rtl::OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
+typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap;
 typedef std::vector< rtl::OUString > UStringList;
 
 class CustomAnimationPreset
@@ -80,7 +80,7 @@ private:
 };
 
 typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<rtl::OUString, CustomAnimationPresetPtr, comphelper::UStringHash, comphelper::UStringEqual> EffectDescriptorMap;
+typedef boost::unordered_map<rtl::OUString, CustomAnimationPresetPtr, rtl::OUStringHash, comphelper::UStringEqual> EffectDescriptorMap;
 typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
 
 struct PresetCategory
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index cbdac52..c880a9e 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -50,7 +50,7 @@ namespace sd {
 class TransitionPreset;
 typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
 typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap;
 
 class TransitionPreset
 {
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 6cd81b3..3d71521 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -169,7 +169,7 @@ private:
         sal_Int32 nId;
         sal_Int32 nLastIndex;
     };
-    typedef ::boost::unordered_map< ::rtl::OUString, struct AuthorComments, comphelper::UStringHash, comphelper::UStringEqual > AuthorsMap;
+    typedef ::boost::unordered_map< ::rtl::OUString, struct AuthorComments, rtl::OUStringHash, comphelper::UStringEqual > AuthorsMap;
     AuthorsMap maAuthors;
 
     void WriteAuthors();
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index ed5d80d..e1facd5 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -130,7 +130,7 @@ private:
     typedef ::boost::unordered_map
         <rtl::OUString,
          ListenerList,
-         ::comphelper::UStringHash,
+         ::rtl::OUStringHash,
          ::comphelper::UStringEqual> ListenerMap;
     ListenerMap maListenerMap;
 
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index fda86ae..208b1e0 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -97,7 +97,7 @@ private:
     typedef ::boost::unordered_map<
         ::rtl::OUString,
         css::uno::Reference<css::drawing::framework::XResourceFactory>,
-        ::comphelper::UStringHash,
+        ::rtl::OUStringHash,
         ::comphelper::UStringEqual> FactoryMap;
     FactoryMap maFactoryMap;
 
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index d153346..635c43d 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -59,7 +59,7 @@ class ModuleController::ResourceToFactoryMap
     : public ::boost::unordered_map<
     rtl::OUString,
     rtl::OUString,
-    ::comphelper::UStringHash,
+    ::rtl::OUStringHash,
     ::comphelper::UStringEqual>
 {
 public:
@@ -71,7 +71,7 @@ class ModuleController::LoadedFactoryContainer
     : public ::boost::unordered_map<
     rtl::OUString,
     WeakReference<XInterface>,
-    ::comphelper::UStringHash,
+    ::rtl::OUStringHash,
     ::comphelper::UStringEqual>
 {
 public:
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index e9574bd..369f31d 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -305,7 +305,7 @@ class FrameworkHelper::ViewURLMap
     : public ::boost::unordered_map<
           rtl::OUString,
           ViewShell::ShellType,
-          ::comphelper::UStringHash,
+          ::rtl::OUStringHash,
           ::comphelper::UStringEqual>
 {
 public:
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 4d358ec..7019c23 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -255,7 +255,7 @@ enum FactoryId
     SlideLayoutControllerFactoryId,
     InsertSlideControllerFactoryId,
 };
-typedef ::boost::unordered_map<OUString, FactoryId, comphelper::UStringHash, comphelper::UStringEqual> FactoryMap;
+typedef ::boost::unordered_map<OUString, FactoryId, rtl::OUStringHash, comphelper::UStringEqual> FactoryMap;
 
 
 namespace {