diff options
Diffstat (limited to 'framework/inc/uielement')
-rw-r--r-- | framework/inc/uielement/commandinfo.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index a322c854af9f..eed42f2238e6 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -35,7 +35,7 @@ struct CommandInfo sal_Int16 nImageInfo; }; -typedef std::unordered_map<OUString, CommandInfo, OUStringHash> CommandToInfoMap; +typedef std::unordered_map<OUString, CommandInfo> CommandToInfoMap; } // namespace framework diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index e90e94d2b9c4..68d445ff7881 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -63,7 +63,7 @@ struct PopupControllerEntry css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider; }; -typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash > PopupControllerCache; +typedef std::unordered_map< OUString, PopupControllerEntry > PopupControllerCache; class MenuBarManager: protected cppu::BaseMutex, diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index d5f9e11f70b4..dcddc5a1909e 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -148,7 +148,7 @@ class ToolBarManager : public ToolbarManager_Base protected: typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::frame::XStatusListener > > ToolBarControllerMap; typedef ::std::vector< css::uno::Reference< css::frame::XSubToolbarController > > SubToolBarControllerVector; - typedef std::unordered_map<OUString, SubToolBarControllerVector, OUStringHash> SubToolBarToSubToolBarControllerMap; + typedef std::unordered_map<OUString, SubToolBarControllerVector> SubToolBarToSubToolBarControllerMap; bool m_bDisposed : 1, m_bAddedToTaskPaneList : 1, diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index c8e5ad01dc32..92a2362b25a3 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -74,12 +74,10 @@ private: public: typedef std::unordered_map< OUString, - OUString, - OUStringHash > ModuleToCommandFileMap; + OUString > ModuleToCommandFileMap; typedef std::unordered_map< OUString, - css::uno::Reference< css::container::XNameAccess >, - OUStringHash > UICommandsHashMap; + css::uno::Reference< css::container::XNameAccess > > UICommandsHashMap; protected: UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool ); |