diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-05-23 01:00:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-16 11:20:02 +0000 |
| commit | 516118b515fb577b1cc40e4b8d7dc06919b64675 (patch) | |
| tree | 092f268442c1c53513d6ca26b9ff3283a64d25b2 /framework/inc/dispatch | |
| parent | 33f39ca2826d09767078cc6f47b0cb572edb1f61 (diff) | |
Resolves: #i118556# replace framework::OUStringHashCode with rtl::OUStringHash
The framework module uses its own hash functions with rtl::OUString's.
It can be replaced by rtl::OUStringHash. The class
framework::OUStringHash can be renamed to framework::OUStringHashMap,
for the sake of clarity only (there is no risk of name clash because of
different namespaces).
Conflicts:
framework/inc/classes/converter.hxx
framework/inc/stdtypes.h
framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
framework/inc/uiconfiguration/uiconfigurationmanager.hxx
framework/inc/uielement/menubarmanager.hxx
framework/inc/xml/eventsdocumenthandler.hxx
framework/source/fwe/classes/addonsoptions.cxx
framework/source/fwi/classes/converter.cxx
framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
framework/source/uielement/toolbarsmenucontroller.cxx
Change-Id: I5e6918bf973b0ca5501473341051782a0dd1a238
Diffstat (limited to 'framework/inc/dispatch')
| -rw-r--r-- | framework/inc/dispatch/menudispatcher.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index a41318fd3705..50f7c1c6de03 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -55,7 +55,7 @@ namespace framework{ *//*-*************************************************************************************************************/ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - OUStringHashCode , + rtl::OUStringHash, std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 3be3298047c8..2c1023c473e2 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -57,7 +57,7 @@ namespace framework{ *//*-*************************************************************************************************************/ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - OUStringHashCode , + rtl::OUStringHash, std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; |