diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-19 17:18:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-23 08:15:35 +0200 |
commit | 87a9979c8938b800aab6e35903d60d24892e7f2e (patch) | |
tree | 6beb01f22537e63df24c023ab65d391a7bee0cf6 /framework/inc | |
parent | d76c4e5c9aaf8bd27ec97679bcaeba5b18aca493 (diff) |
overload std::hash for OUString and OString
no need to explicitly specify it anymore
Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec
Reviewed-on: https://gerrit.libreoffice.org/43567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/classes/protocolhandlercache.hxx | 4 | ||||
-rw-r--r-- | framework/inc/uiconfiguration/graphicnameaccess.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uiconfiguration/imagetype.hxx | 6 | ||||
-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 | ||||
-rw-r--r-- | framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4 | ||||
-rw-r--r-- | framework/inc/uifactory/factoryconfiguration.hxx | 3 | ||||
-rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 3 | ||||
-rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 3 |
12 files changed, 15 insertions, 26 deletions
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 3c755616553d..31859fea13e0 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -60,12 +60,12 @@ struct FWI_DLLPUBLIC ProtocolHandler uno implementation names as value. Overloading of the index operator makes it possible to search for a key by using a full qualified URL on list of all possible pattern keys. */ -typedef std::unordered_map<OUString, OUString, OUStringHash> PatternHash; +typedef std::unordered_map<OUString, OUString> PatternHash; /** This hash holds protocol handler structs by her names. */ -typedef std::unordered_map<OUString, ProtocolHandler, OUStringHash> HandlerHash; +typedef std::unordered_map<OUString, ProtocolHandler> HandlerHash; /** @short this hash makes it easy to find a protocol handler by using his uno implementation name. diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index b53a3de27796..7b6405033aba 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -46,7 +46,7 @@ namespace framework virtual css::uno::Type SAL_CALL getElementType( ) override; private: - typedef std::unordered_map<OUString, css::uno::Reference< css::graphic::XGraphic >, OUStringHash> NameGraphicHashMap; + typedef std::unordered_map<OUString, css::uno::Reference< css::graphic::XGraphic >> NameGraphicHashMap; NameGraphicHashMap m_aNameToElementMap; css::uno::Sequence< OUString > m_aSeq; }; diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index d759674cf1a1..783d1ce88377 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -27,11 +27,9 @@ namespace framework { typedef std::unordered_map< OUString, - OUString, - OUStringHash > CommandToImageNameMap; + OUString > CommandToImageNameMap; typedef std::unordered_map< OUString, - bool, - OUStringHash > CommandMap; + bool > CommandMap; } 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 ); diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index dcdc60e58d09..edcc7f7e2e02 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -58,9 +58,7 @@ namespace framework { private: class FactoryManagerMap : public std::unordered_map<OUString, - OUString, - OUStringHash - > + OUString> { }; diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 1b34b38a3cb2..dcbf4daae09f 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -72,8 +72,7 @@ private: ControllerInfo(){} }; class MenuControllerMap : public std::unordered_map< OUString, - ControllerInfo, - OUStringHash > + ControllerInfo > { }; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index fe134597bc90..cd41974d51e8 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -89,9 +89,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax: private: OUString getErrorLineString(); - class ImageHashMap : public std::unordered_map< OUString , - Image_XML_Entry , - OUStringHash > + class ImageHashMap : public std::unordered_map< OUString, Image_XML_Entry > { }; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 896c71ff6fef..b0cb57c4fe23 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -88,8 +88,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : OUString getErrorLineString(); class StatusBarHashMap : public std::unordered_map<OUString, - StatusBar_XML_Entry, - OUStringHash > + StatusBar_XML_Entry > { }; diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 7dc7133ec337..c2be53da64d1 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -87,8 +87,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : OUString getErrorLineString(); class ToolBoxHashMap : public std::unordered_map<OUString, - ToolBox_XML_Entry, - OUStringHash > + ToolBox_XML_Entry> { }; |