diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 15:53:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:46:34 +0000 |
| commit | bfb9612226314cd037c8eda30cc6ebbb46dc8512 (patch) | |
| tree | 9cb3d9d1bf9ec134adb0ec9d7e4eae67979f8347 /framework/source/uiconfiguration | |
| parent | 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4 (diff) | |
tdf#97499 Fixed containers parameters clearing #3
Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source/uiconfiguration')
| -rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.hxx | 3 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 9b4af2536b68..f1f71b06362b 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -127,8 +127,7 @@ namespace framework typedef std::unordered_map< OUString, sal_Bool, - OUStringHash, - std::equal_to< OUString > > ImageNameMap; + OUStringHash > ImageNameMap; enum Layer { diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 59b5cc1333bb..ebdf8277dcc1 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -91,7 +91,7 @@ public: private: virtual void SAL_CALL disposing() override; - typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, std::equal_to< OUString > > ModuleToModuleCfgMgr; + typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); |