framework/inc/classes/filtercachedata.hxx | 24
+++++-----
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/dispatch/popupmenudispatcher.hxx | 2
framework/inc/services/substitutepathvars.hxx | 4 -
framework/inc/stdtypes.h | 13 +----
framework/inc/uiconfiguration/imagetype.hxx | 4 -
framework/inc/uiconfiguration/moduleuicfgsupplier.hxx | 2
framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx | 4 -
framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 4 -
framework/inc/uiconfiguration/windowstateconfiguration.hxx | 4 -
framework/inc/uielement/controlmenucontroller.hxx | 2
framework/inc/uielement/menubarmanager.hxx | 2
framework/inc/uielement/uicommanddescription.hxx | 4 -
framework/inc/uifactory/factoryconfiguration.hxx | 2
framework/inc/uifactory/uielementfactorymanager.hxx | 2
framework/inc/xml/imagesdocumenthandler.hxx | 2
framework/inc/xml/statusbardocumenthandler.hxx | 2
framework/inc/xml/toolboxdocumenthandler.hxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 13 +----
framework/source/uiconfiguration/imagemanagerimpl.hxx | 2
framework/source/uiconfiguration/uicategorydescription.cxx | 2
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 2
framework/source/uielement/uicommanddescription.cxx | 2
24 files changed, 45 insertions(+), 59 deletions(-)
New commits:
commit 516118b515fb577b1cc40e4b8d7dc06919b64675
Author: Ariel Constenla-Haile <arie...@apache.org>
Date: Wed May 23 01:00:41 2012 +0000
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
diff --git a/framework/inc/classes/filtercachedata.hxx
b/framework/inc/classes/filtercachedata.hxx
index 2374d55..8fb2090 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
diff --git a/framework/inc/dispatch/menudispatcher.hxx
b/framework/inc/dispatch/menudispatcher.hxx
index a41318f..50f7c1c6 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 3be3298..2c1023c 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;
diff --git a/framework/inc/services/substitutepathvars.hxx
b/framework/inc/services/substitutepathvars.hxx
index 48c3342..532ba18 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -95,7 +95,7 @@ struct SubstitutePathNotify
class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString,
SubstituteRule,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
public:
@@ -262,7 +262,7 @@ class SubstitutePathVariables : private ThreadHelpBase, //
Struct for right init
private:
class VarNameToIndexMap : public boost::unordered_map<
::rtl::OUString,
PreDefVariable,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
inline void free()
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 8d39437..7cb7bfd 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -39,13 +39,6 @@ namespace framework{
/**
Own hash functions used for stl-structures ... e.g. hash tables/maps ...
*/
-struct OUStringHashCode
-{
- size_t operator()( const ::rtl::OUString& sString ) const
- {
- return sString.hashCode();
- }
-};
struct ShortHashCode
{
@@ -142,7 +135,7 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue;
template< class TType >
class BaseHash : public ::boost::unordered_map< ::rtl::OUString
,
TType ,
- OUStringHashCode ,
+ rtl::OUStringHash ,
::std::equal_to< ::rtl::OUString > >
{
public:
@@ -160,7 +153,7 @@ class BaseHash : public ::boost::unordered_map<
::rtl::OUString
Basic OUString hash.
Key and values are OUStrings.
*/
-typedef BaseHash< ::rtl::OUString > OUStringHash;
+typedef BaseHash< ::rtl::OUString > OUStringHashMap;
//_________________________________________________________________________________________________________________
@@ -179,7 +172,7 @@ typedef BaseHash< sal_Int32 > NameToHandleHash;
So it's better to declare it one times only!
*/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString
,
- OUStringHashCode
,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > > ListenerHash;
} // namespace framework
diff --git a/framework/inc/uiconfiguration/imagetype.hxx
b/framework/inc/uiconfiguration/imagetype.hxx
index 247bcc3..4ddd79a 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -35,11 +35,11 @@ enum ImageType
typedef boost::unordered_map< rtl::OUString,
rtl::OUString,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
CommandToImageNameMap;
typedef boost::unordered_map< rtl::OUString,
bool,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > CommandMap;
}
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index fb3d0b7..6d8f564 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -80,7 +80,7 @@ namespace framework
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
private:
- typedef ::boost::unordered_map< rtl::OUString,
com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager
>, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
+ typedef ::boost::unordered_map< rtl::OUString,
com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager
>, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 8df213a..2712e6a 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -151,7 +151,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::boost::unordered_map< rtl::OUString, UIElementData,
OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementData,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -171,7 +171,7 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent >
ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< rtl::OUString, UIElementInfo,
OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementInfo,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 68d3014..36bd51e 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -129,7 +129,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::boost::unordered_map< rtl::OUString, UIElementData,
OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementData,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -149,7 +149,7 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent >
ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< rtl::OUString, UIElementInfo,
OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementInfo,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index bb96474..363497e 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -92,12 +92,12 @@ class WindowStateConfiguration : private ThreadHelpBase
typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
ModuleToWindowStateFileMap;
typedef ::boost::unordered_map< ::rtl::OUString,
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess >,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
ModuleToWindowStateConfigHashMap;
private:
diff --git a/framework/inc/uielement/controlmenucontroller.hxx
b/framework/inc/uielement/controlmenucontroller.hxx
index c90d861..e022852 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -74,7 +74,7 @@ namespace framework
class UrlToDispatchMap : public ::boost::unordered_map<
::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
public:
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index 13397cc..e7a6688 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -66,7 +66,7 @@ struct PopupControllerEntry
::com::sun::star::uno::WeakReference<
::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
};
-typedef boost::unordered_map< rtl::OUString, PopupControllerEntry,
OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache;
+typedef boost::unordered_map< rtl::OUString, PopupControllerEntry,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
diff --git a/framework/inc/uielement/uicommanddescription.hxx
b/framework/inc/uielement/uicommanddescription.hxx
index 309d9b3..987a1d8 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -75,12 +75,12 @@ private:
public:
typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
ModuleToCommandFileMap;
typedef ::boost::unordered_map< ::rtl::OUString,
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess >,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
UICommandsHashMap;
protected:
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx
b/framework/inc/uifactory/factoryconfiguration.hxx
index a8a86d4..6e04ca8 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -81,7 +81,7 @@ private:
};
class MenuControllerMap : public boost::unordered_map< rtl::OUString,
ControllerInfo,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
inline void free()
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx
b/framework/inc/uifactory/uielementfactorymanager.hxx
index fa2cb8b..001988f 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -74,7 +74,7 @@ namespace framework
private:
class FactoryManagerMap : public boost::unordered_map< rtl::OUString,
rtl::OUString,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
inline void free()
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx
b/framework/inc/xml/imagesdocumenthandler.hxx
index e53fb33..4f17ff4 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -111,7 +111,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,
// Struct for right
class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString
,
Image_XML_Entry ,
- OUStringHashCode ,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
public:
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx
b/framework/inc/xml/statusbardocumenthandler.hxx
index a0802d1..4fecf77 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -108,7 +108,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private
ThreadHelpBase, // S
class StatusBarHashMap : public ::boost::unordered_map<
::rtl::OUString ,
StatusBar_XML_Entry
,
- OUStringHashCode
,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
public:
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx
b/framework/inc/xml/toolboxdocumenthandler.hxx
index 63b184d..9cb2564 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -113,7 +113,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private
ThreadHelpBase, // S
class ToolBoxHashMap : public ::boost::unordered_map<
::rtl::OUString ,
ToolBox_XML_Entry
,
- OUStringHashCode
,
+ rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
{
public:
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index c7a6490..47c4efb 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -256,13 +256,6 @@ class AddonsOptions_Impl : public ConfigItem
//-------------------------------------------------------------------------------------------------------------
private:
- struct OUStringHashCode
- {
- size_t operator()( const OUString& sString ) const
- {
- return sString.hashCode();
- }
- };
struct ImageEntry
{
@@ -273,10 +266,10 @@ class AddonsOptions_Impl : public ConfigItem
Image aImageBigNoScale;
};
- typedef boost::unordered_map< OUString, ImageEntry, OUStringHashCode,
::std::equal_to< OUString > > ImageManager;
- typedef boost::unordered_map< OUString, sal_uInt32, OUStringHashCode,
::std::equal_to< OUString > > StringToIndexMap;
+ typedef boost::unordered_map< OUString, ImageEntry, OUStringHash,
::std::equal_to< OUString > > ImageManager;
+ typedef boost::unordered_map< OUString, sal_uInt32, OUStringHash,
::std::equal_to< OUString > > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > >
AddonToolBars;
- typedef ::boost::unordered_map< OUString,
MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< OUString >
> ToolbarMergingInstructions;
+ typedef ::boost::unordered_map< OUString,
MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > >
ToolbarMergingInstructions;
enum ImageSize
{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx
b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index be5d8b1..a1416b0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -142,7 +142,7 @@ namespace framework
typedef boost::unordered_map< rtl::OUString,
sal_Bool,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
ImageNameMap;
enum Layer
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx
b/framework/source/uiconfiguration/uicategorydescription.cxx
index 0179d71..5e70410 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -115,7 +115,7 @@ class ConfigurationAccess_UICategory : // Order is
necessary for right initializ
private:
typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
IdToInfoCache;
sal_Bool initializeConfigAccess();
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx
b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index f31e416..fc61fa6 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -239,7 +239,7 @@ class ConfigurationAccess_WindowState : // interfaces
private:
typedef ::boost::unordered_map< ::rtl::OUString,
WindowStateInfo,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
ResourceURLToInfoCache;
rtl::OUString m_aConfigWindowAccess;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx
b/framework/source/uielement/toolbarsmenucontroller.cxx
index 2cace90..b085f84 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -85,7 +85,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework
{
-typedef boost::unordered_map< OUString, OUString, OUStringHashCode,
::std::equal_to< OUString > > ToolbarHashMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash,
::std::equal_to< OUString > > ToolbarHashMap;
struct ToolBarEntry
{
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index efaa72c..d10965e 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -155,7 +155,7 @@ class ConfigurationAccess_UICommand : // Order is necessary
for right initializa
private:
typedef ::boost::unordered_map< ::rtl::OUString,
CmdToInfoMap,
- OUStringHashCode,
+ rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
CommandToInfoCache;
sal_Bool initializeConfigAccess();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
