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/classes | |
| 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/classes')
| -rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 2374d55c13e1..8fb2090582df 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -123,7 +123,7 @@ struct FileType sal_Bool bPreferred ; ::rtl::OUString sName ; - OUStringHash lUINames ; + OUStringHashMap lUINames ; ::rtl::OUString sMediaType ; ::rtl::OUString sClipboardFormat ; sal_Int32 nDocumentIconID ; @@ -194,7 +194,7 @@ struct Filter sal_Int32 nOrder ; ::rtl::OUString sName ; ::rtl::OUString sType ; - OUStringHash lUINames ; + OUStringHashMap lUINames ; ::rtl::OUString sDocumentService ; ::rtl::OUString sFilterService ; ::rtl::OUString sUIComponent ; @@ -293,7 +293,7 @@ struct Loader public: ::rtl::OUString sName ; - OUStringHash lUINames ; + OUStringHashMap lUINames ; OUStringList lTypes ; }; @@ -349,7 +349,7 @@ struct ContentHandler template< class HashType > class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString , HashType , - OUStringHashCode , + rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > { //------------------------------------------------------------------------------------------------------------- @@ -390,7 +390,7 @@ class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString //***************************************************************************************************************** class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString , OUStringList , - OUStringHashCode , + rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > { public: @@ -445,7 +445,7 @@ typedef SetNodeHash< Filter > FilterHash typedef SetNodeHash< Detector > DetectorHash ; typedef SetNodeHash< Loader > LoaderHash ; typedef SetNodeHash< ContentHandler > ContentHandlerHash ; -typedef OUStringHash PreferredHash ; +typedef OUStringHashMap PreferredHash ; typedef OUStringList OrderList ; typedef CheckedIterator< OUStringList > CheckedStringListIterator ; @@ -555,14 +555,14 @@ class DataContainer : private ThreadHelpBase const ::rtl::OUString& sCurrentLocale ); static void extractLocalizedStrings ( const ::rtl::OUString& sCurrentLocale , const css::uno::Any& aCFGValue , - OUStringHash& lLocales ); + OUStringHashMap& lLocales ); static void packLocalizedStrings ( sal_Int16 nMode , const ::rtl::OUString& sCurrentLocale , css::uno::Any& aCFGValue , - const OUStringHash& lLocales ); - static ::rtl::OUString getLocalelizedString ( const OUStringHash& lLocales , + const OUStringHashMap& lLocales ); + static ::rtl::OUString getLocalelizedString ( const OUStringHashMap& lLocales , const ::rtl::OUString& sLocale ); - static void setLocalelizedString ( OUStringHash& lLocales , + static void setLocalelizedString ( OUStringHashMap& lLocales , const ::rtl::OUString& sLocale , const ::rtl::OUString& sValue ); static void correctExtensions ( OUStringList& lExtensions ); @@ -627,8 +627,8 @@ class FilterCFGAccess : public ::utl::ConfigItem static ::rtl::OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList static OUStringList decodeStringList( const ::rtl::OUString& sValue ); - void setProductName ( OUStringHash& lUINames ); - void resetProductName ( OUStringHash& lUINames ); + void setProductName ( OUStringHashMap& lUINames ); + void resetProductName ( OUStringHashMap& lUINames ); //------------------------------------------------------------------------------------------------------------- // internal helper |