summaryrefslogtreecommitdiffstats
path: root/framework/source
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx2
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx6
-rw-r--r--framework/source/inc/accelerators/acceleratorcache.hxx2
-rw-r--r--framework/source/inc/accelerators/keymapping.hxx2
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx5
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx2
-rw-r--r--framework/source/uiconfiguration/CommandImageResolver.hxx2
-rw-r--r--framework/source/uiconfiguration/image.h2
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx3
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx3
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx9
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx3
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
-rw-r--r--framework/source/uielement/uicommanddescription.cxx3
19 files changed, 26 insertions, 34 deletions
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 0948f63c4c6c..dc0f8e3850cc 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -77,7 +77,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
sal_Int32 c1 = lProvider.getLength();
sal_Int32 i1 = 0;
- std::unordered_map<OUString, css::frame::DispatchInformation, OUStringHash> lInfos;
+ std::unordered_map<OUString, css::frame::DispatchInformation> lInfos;
for (i1=0; i1<c1; ++i1)
{
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 89a037799942..3017197b7b16 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -228,10 +228,10 @@ class AddonsOptions_Impl : public ConfigItem
void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
};
- typedef std::unordered_map< OUString, ImageEntry, OUStringHash > ImageManager;
- typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > StringToIndexMap;
+ typedef std::unordered_map< OUString, ImageEntry > ImageManager;
+ typedef std::unordered_map< OUString, sal_uInt32 > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
- typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;
+ typedef std::unordered_map< OUString, MergeToolbarInstructionContainer > ToolbarMergingInstructions;
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent our module tree
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 28302e849020..fc295ae004dc 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -52,7 +52,7 @@ class AcceleratorCache
commands -> keys
*/
typedef ::std::vector< css::awt::KeyEvent > TKeyList;
- typedef std::unordered_map<OUString, TKeyList, OUStringHash> TCommand2Keys;
+ typedef std::unordered_map<OUString, TKeyList> TCommand2Keys;
/** TODO document me
keys -> commands
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 639d6e09a9d7..0f610e599e3a 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -52,7 +52,7 @@ class KeyMapping
};
/** @short hash structure to map identifier to key codes. */
- typedef std::unordered_map<OUString, sal_Int16, OUStringHash> Identifier2CodeHash;
+ typedef std::unordered_map<OUString, sal_Int16> Identifier2CodeHash;
/** @short hash structure to map key codes to identifier. */
typedef std::unordered_map<sal_Int16, OUString> Code2IdentifierHash;
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 0e5eb0c39dac..43d7e1ba75f8 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -56,9 +56,8 @@ class StorageHolder final
};
/** @short TODO */
- typedef std::unordered_map< OUString ,
- TStorageInfo ,
- OUStringHash > TPath2StorageInfo;
+ typedef std::unordered_map< OUString,
+ TStorageInfo > TPath2StorageInfo;
// member
private:
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 37d8032bcd04..93aa48f98431 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -419,7 +419,7 @@ private:
WindowCommandDispatch* m_pWindowCommandDispatch;
- typedef std::unordered_map<OUString, css::beans::Property, OUStringHash> TPropInfoHash;
+ typedef std::unordered_map<OUString, css::beans::Property> TPropInfoHash;
TPropInfoHash m_lProps;
ListenerHash m_lSimpleChangeListener;
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 243e36f848ca..26bd6bfae718 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -136,7 +136,7 @@ class PathSettings : private cppu::BaseMutex
bool bIsReadonly;
};
- typedef std::unordered_map<OUString, PathSettings::PathInfo, OUStringHash> PathHash;
+ typedef std::unordered_map<OUString, PathSettings::PathInfo> PathHash;
enum EChangeOp
{
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index d851deb0152e..ce7e0b4491ae 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -180,7 +180,7 @@ protected:
OUString const & impl_getSubstituteVariableValue( const OUString& variable );
private:
- typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
+ typedef std::unordered_map<OUString, PreDefVariable>
VarNameToIndexMap;
VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access
diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx
index 8d5a3c9ef309..8b5dbe3a82b5 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.hxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.hxx
@@ -28,7 +28,7 @@ namespace vcl
class CommandImageResolver final
{
private:
- typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap;
+ typedef std::unordered_map<OUString, OUString > CommandToImageNameMap;
CommandToImageNameMap m_aCommandToImageNameMap;
std::vector<OUString> m_aImageCommandNameVector;
diff --git a/framework/source/uiconfiguration/image.h b/framework/source/uiconfiguration/image.h
index 9b0542f1462f..1005fc39cdf1 100644
--- a/framework/source/uiconfiguration/image.h
+++ b/framework/source/uiconfiguration/image.h
@@ -45,7 +45,7 @@ struct ImageAryData
struct ImplImageList
{
- typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
+ typedef std::unordered_map< OUString, ImageAryData * >
ImageAryDataNameHash;
std::vector<ImageAryData *> maImages;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 8f4d3942a354..34cc99dd2f53 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -147,8 +147,7 @@ namespace framework
void clear();
typedef std::unordered_map< OUString,
- sal_Bool,
- OUStringHash > ImageNameMap;
+ sal_Bool > ImageNameMap;
enum NotifyOp
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 14c3d0905d1e..d10f944a876c 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -86,7 +86,7 @@ public:
private:
virtual void SAL_CALL disposing() final override;
- typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash > ModuleToModuleCfgMgr;
+ typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 > > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index fcde32765a42..12867b100403 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -170,7 +170,7 @@ private:
css::uno::Reference< css::container::XIndexAccess > xSettings;
};
- typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
+ typedef std::unordered_map< OUString, UIElementData > UIElementDataHashMap;
struct UIElementType
{
@@ -187,7 +187,7 @@ private:
typedef std::vector< UIElementType > UIElementTypesVector;
typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
+ typedef std::unordered_map< OUString, UIElementInfo > UIElementInfoHashMap;
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 50ea375c93bd..d6712cbcf9be 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -86,8 +86,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
private:
typedef std::unordered_map< OUString,
- OUString,
- OUStringHash > IdToInfoCache;
+ OUString > IdToInfoCache;
void initializeConfigAccess();
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 16a3ca5310cf..01c4becd60ff 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -151,7 +151,7 @@ private:
struct UIElementType;
friend struct UIElementType;
- typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
+ typedef std::unordered_map< OUString, UIElementData > UIElementDataHashMap;
struct UIElementType
{
@@ -168,7 +168,7 @@ private:
typedef std::vector< UIElementType > UIElementTypesVector;
typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
+ typedef std::unordered_map< OUString, UIElementInfo > UIElementInfoHashMap;
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 99a6464c50e0..4cf804a2226f 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -199,8 +199,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
private:
typedef std::unordered_map< OUString,
- WindowStateInfo,
- OUStringHash > ResourceURLToInfoCache;
+ WindowStateInfo > ResourceURLToInfoCache;
osl::Mutex m_aMutex;
OUString m_aConfigWindowAccess;
@@ -1265,12 +1264,10 @@ public:
virtual sal_Bool SAL_CALL hasElements() override;
typedef std::unordered_map< OUString,
- OUString,
- OUStringHash > ModuleToWindowStateFileMap;
+ OUString > ModuleToWindowStateFileMap;
typedef std::unordered_map< OUString,
- css::uno::Reference< css::container::XNameAccess >,
- OUStringHash > ModuleToWindowStateConfigHashMap;
+ css::uno::Reference< css::container::XNameAccess > > ModuleToWindowStateConfigHashMap;
private:
css::uno::Reference< css::uno::XComponentContext> m_xContext;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 5357e6955859..83282c2b0025 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -147,8 +147,7 @@ private:
virtual void impl_setPopupMenu() override;
class UrlToDispatchMap : public std::unordered_map< OUString,
- uno::Reference< frame::XDispatch >,
- OUStringHash >
+ uno::Reference< frame::XDispatch > >
{
public:
void free()
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index e004b693e388..dca1f9f52d6b 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -73,7 +73,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework
{
-typedef std::unordered_map< OUString, OUString, OUStringHash > ToolbarHashMap;
+typedef std::unordered_map< OUString, OUString > ToolbarHashMap;
struct ToolBarEntry
{
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 62b1fa3b7198..8659c18dd3b4 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -126,8 +126,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
private:
typedef std::unordered_map< OUString,
- CmdToInfoMap,
- OUStringHash > CommandToInfoCache;
+ CmdToInfoMap > CommandToInfoCache;
void initializeConfigAccess();
generated by cgit (git 2.34.1) at 2024-06-23 21:25:37 +0000