diff options
author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-04 21:35:57 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-04 21:35:57 -0400 |
commit | 66d882b3c87d82da82a32f1fabb8c9f8471e1847 (patch) | |
tree | 92366557528ffcfdffdd7f747ca45a9d67f22022 /sd | |
parent | b2773c8dbae4e37348cc032a55d962149a1d9d0d (diff) |
Use rtl::OUStringHash.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/CustomAnimationPreset.hxx | 6 | ||||
-rw-r--r-- | sd/inc/TransitionPreset.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptooxml.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/configuration/ResourceFactoryManager.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/module/ModuleController.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index b350a7f81c91..4b8aed0a4f19 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 1c274ba8d551..d28f700eb3c6 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 6cd81b3494ff..3d715213986d 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 e2073b38a942..ecad1923bacc 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 f388231a10a0..22d64b7ad5d5 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 442b78eac6f2..0a48b82fd9d8 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 f51f9dbbe900..147f7efcb2c0 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 f086164ef393..5e835aaf2bdf 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 { |