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 --- vbahelper/source/msforms/vbacontrols.cxx | 3 +-- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 2 +- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index c48124970c37..ecce57dc4797 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -38,8 +38,7 @@ using namespace com::sun::star; using namespace ooo::vba; -typedef std::unordered_map< OUString, sal_Int32, OUStringHash, - std::equal_to< OUString > > ControlIndexMap; +typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ControlIndexMap; typedef std::vector< uno::Reference< awt::XControl > > ControlVec; class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 5e0c3ed6a55c..641ed887f445 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -143,7 +143,7 @@ struct VbaTimerInfoHash }; // ====VbaTimerHashMap================================== -typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, std::equal_to< VbaTimerInfo > > VbaTimerHashMap; +typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash > VbaTimerHashMap; // ====VbaApplicationBase_Impl================================== struct VbaApplicationBase_Impl diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index ae8098d8150f..054b60036bbc 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -59,8 +59,7 @@ static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocume static const char aTextDocument[] = "com.sun.star.text.TextDocument"; typedef std::unordered_map< OUString, - sal_Int32, OUStringHash, - ::std::equal_to< OUString > > NameIndexHash; + sal_Int32, OUStringHash > NameIndexHash; typedef std::vector < uno::Reference< frame::XModel > > Documents; -- cgit