summaryrefslogtreecommitdiff
path: root/vbahelper
diff options
context:
space:
mode:
authortymyjan <tymyjan@yahoo.co.uk>2016-04-03 17:42:53 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-04 05:49:06 +0000
commitc20cc7e79b3b3d8bcf9136bfdc2bab6dd6a4be06 (patch)
treedaecf1a18f37c46e0cca823f976b419de8e4f2c2 /vbahelper
parentbfb9612226314cd037c8eda30cc6ebbb46dc8512 (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 'vbahelper')
-rw-r--r--vbahelper/source/msforms/vbacontrols.cxx3
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbadocumentsbase.cxx3
3 files changed, 3 insertions, 5 deletions
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;