diff options
author | Douglas Mencken <dougmencken@gmail.com> | 2015-10-04 22:19:14 -0400 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-10-06 12:13:54 +0000 |
commit | 85b1f91779cd90eb1c7808909c2721239fc51dd1 (patch) | |
tree | 21ca582dc9435d15304a9ea80170482cf0c18bfb /vbahelper/source | |
parent | 8e7a2a62d1bd14ea629b4cbbdccd0c9b9b14a6e5 (diff) |
vba: convert to variadic InheritedHelperInterfaceImpl&WeakImpl etc
Variadic templates ~-i.e. templates, which can take an arbitrary
number of arguments of any type-~ is new C++11 feature
note that uno::Reference and cppu::UnoType can only take one parameter
thus leave XNamedObjectCollectionHelper non-variadic in vbacollectionimpl.hxx
Change-Id: I22e60fa050ee31d39ae8bb7cac06cf243c4587b1
Reviewed-on: https://gerrit.libreoffice.org/19145
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vbahelper/source')
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbauserform.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacolorformat.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbar.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbafillformat.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbalineformat.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbapictureformat.hxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index b2528ec62fae..eec5175a0c09 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -32,7 +32,7 @@ #include <vbahelper/vbahelperinterface.hxx> #include <memory> -typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XControl > ControlImpl_BASE; class ScVbaControl : public ControlImpl_BASE { diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index d2ab14ec979e..b672de8feb0c 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -28,7 +28,7 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbacontrol.hxx" -//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE; +//typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XUserForm > ScVbaUserForm_BASE; typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE; class ScVbaUserForm : public ScVbaUserForm_BASE diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 3bb88e990832..e1558c081504 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -25,7 +25,7 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbafillformat.hxx" -typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XColorFormat > ScVbaColorFormat_BASE; class ColorFormatType { diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index 8073db095b0e..3c2ddba1e19a 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -28,7 +28,7 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbacommandbarhelper.hxx" -typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::XCommandBar > CommandBar_BASE; class ScVbaCommandBar : public CommandBar_BASE { diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index 196ef499bf41..4b4b07a605d5 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -28,7 +28,7 @@ #include "vbacommandbarhelper.hxx" #include <cppuhelper/implbase.hxx> -typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::XCommandBarControl > CommandBarControl_BASE; class ScVbaCommandBarControl : public CommandBarControl_BASE { diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx index af434208abc4..5f61c13867ec 100644 --- a/vbahelper/source/vbahelper/vbafillformat.hxx +++ b/vbahelper/source/vbahelper/vbafillformat.hxx @@ -24,7 +24,7 @@ #include <ooo/vba/msforms/XFillFormat.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XFillFormat > ScVbaFillFormat_BASE; class ScVbaFillFormat : public ScVbaFillFormat_BASE { diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index f88e2982007a..0f69ea2aec9e 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -24,7 +24,7 @@ #include <ooo/vba/msforms/XLineFormat.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XLineFormat > ScVbaLineFormat_BASE; class ScVbaLineFormat : public ScVbaLineFormat_BASE { diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx index 5524cc8c8846..d08e72c5858b 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.hxx +++ b/vbahelper/source/vbahelper/vbapictureformat.hxx @@ -24,7 +24,7 @@ #include <ooo/vba/msforms/XPictureFormat.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE; class ScVbaPictureFormat : public ScVbaPictureFormat_BASE { |