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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
| -rw-r--r-- | cui/source/inc/macropg.hxx | 3 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 736b228e86c5..3cb3a4b33547 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -766,7 +766,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries() { if ( !m_pRootEntry ) { - typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo; + typedef std::unordered_map< OUString, bool > MenuInfo; MenuInfo aMenuInfo; m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) ); @@ -2368,8 +2368,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef std::unordered_map<OUString, bool, - OUStringHash > ToolbarInfo; + typedef std::unordered_map<OUString, bool > ToolbarInfo; ToolbarInfo aToolbarInfo; @@ -2978,8 +2977,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, pTbSymbol->set_height_request(aTbSize.Height()); pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING); - typedef std::unordered_map< OUString, bool, - OUStringHash > ImageInfo; + typedef std::unordered_map< OUString, bool > ImageInfo; pTbSymbol->SetPageScroll( true ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 736c4de3cbcf..cd6ecb5533e1 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -35,8 +35,7 @@ class SvTreeListBox; -typedef std::unordered_map< OUString, std::pair< OUString, OUString >, - OUStringHash > EventsHash; +typedef std::unordered_map< OUString, std::pair< OUString, OUString > > EventsHash; struct EventDisplayName { diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 6cdcde954fa2..0b80c7b06330 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -38,8 +38,7 @@ #define OBJTYPE_SCRIPTCONTAINER 3L #define OBJTYPE_SFROOT 4L -typedef std::unordered_map < OUString, OUString, - OUStringHash > Selection_hash; +typedef std::unordered_map < OUString, OUString > Selection_hash; class SFEntry; |