From c20cc7e79b3b3d8bcf9136bfdc2bab6dd6a4be06 Mon Sep 17 00:00:00 2001 From: tymyjan Date: Sun, 3 Apr 2016 17:42:53 +0200 Subject: tdf#97499 Fixed containers parameters clearing #4 Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513 Reviewed-on: https://gerrit.libreoffice.org/23754 Tested-by: Jenkins Reviewed-by: Noel Grandin --- scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2 +- scripting/source/vbaevents/eventhelper.cxx | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'scripting') diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 656690b2254b..e0833497d8b1 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -157,7 +157,7 @@ public: //typedef std::map< OUString, Reference< browse::XBrowseNode > > typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >, - OUStringHash, ::std::equal_to< OUString > > + OUStringHash > BrowseNodeAggregatorHash; typedef std::vector< OUString > vString; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 10e8c24dd24a..d43f930b0166 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -190,8 +190,7 @@ struct TranslateInfo typedef std::unordered_map< OUString, std::list< TranslateInfo >, -OUStringHash, -::std::equal_to< OUString > > EventInfoHash; +OUStringHash > EventInfoHash; struct TranslatePropMap @@ -487,8 +486,7 @@ public: { return !m_hEvents.empty(); } private: -typedef std::unordered_map< OUString, Any, OUStringHash, -::std::equal_to< OUString > > EventSupplierHash; +typedef std::unordered_map< OUString, Any, OUStringHash > EventSupplierHash; EventSupplierHash m_hEvents; }; -- cgit