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 /include/vbahelper/vbareturntypes.hxx | |
| 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 'include/vbahelper/vbareturntypes.hxx')
| -rw-r--r-- | include/vbahelper/vbareturntypes.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 99885d6ee2ab..2c5b3871606d 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_VBAHELPER_VBARETURNTYPES_HXX #define INCLUDED_VBAHELPER_VBARETURNTYPES_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XDefaultProperty.hpp> #include <ooo/vba/msforms/XReturnInteger.hpp> #include <ooo/vba/msforms/XReturnBoolean.hpp> @@ -34,7 +34,7 @@ namespace ooo namespace vba { template< typename T1, typename T2 > - class DefaultReturnHelper : public ::cppu::WeakImplHelper2< T2, css::script::XDefaultProperty > + class DefaultReturnHelper : public ::cppu::WeakImplHelper< T2, css::script::XDefaultProperty > { T1 mnValue; public: |