diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 17:42:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:49:06 +0000 |
| commit | c20cc7e79b3b3d8bcf9136bfdc2bab6dd6a4be06 (patch) | |
| tree | daecf1a18f37c46e0cca823f976b419de8e4f2c2 /cui | |
| parent | bfb9612226314cd037c8eda30cc6ebbb46dc8512 (diff) | |
tdf#97499 Fixed containers parameters clearing #4
Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513
Reviewed-on: https://gerrit.libreoffice.org/23754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 27f9b2498874..ed88815bc6f2 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1387,7 +1387,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries() { if ( !m_pRootEntry ) { - typedef std::unordered_map< OUString, bool, OUStringHash, std::equal_to< OUString > > MenuInfo; + typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo; MenuInfo aMenuInfo; m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) ); @@ -3899,7 +3899,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) SvxEntries* ToolbarSaveInData::GetEntries() { typedef std::unordered_map<OUString, bool, - OUStringHash, std::equal_to< OUString > > ToolbarInfo; + OUStringHash > ToolbarInfo; ToolbarInfo aToolbarInfo; @@ -4965,7 +4965,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING); typedef std::unordered_map< OUString, bool, - OUStringHash, std::equal_to< OUString > > ImageInfo; + OUStringHash > ImageInfo; pTbSymbol->SetPageScroll( true ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index e717b97502a8..1dcfc36b7445 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -39,7 +39,7 @@ #define OBJTYPE_SFROOT 4L typedef std::unordered_map < OUString, OUString, - OUStringHash, std::equal_to< OUString > > Selection_hash; + OUStringHash > Selection_hash; class SFEntry; |