diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-06 18:44:54 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-06 20:23:13 +0000 |
commit | 403fa5ec2a9a3459f8e62aadf451626386fdd9dc (patch) | |
tree | d534b03b75142ca2d7ec7c5b23a910a834419e27 /sw/source/uibase/inc/unomailmerge.hxx | |
parent | 9f1ffa641b67a4359611bb62d147a9a1e09312cd (diff) |
sw: use variadic cppu::WeakImplHelper
Change-Id: I2c03ffad8d935bad126c19a8647c924af5a9bce5
Reviewed-on: https://gerrit.libreoffice.org/15174
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/uibase/inc/unomailmerge.hxx')
-rw-r--r-- | sw/source/uibase/inc/unomailmerge.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 6ede6aa3bd80..14c1ad5f2f79 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <unotools/configitem.hxx> @@ -63,7 +63,7 @@ class SwDBManager; class MailMergeExecuteFinalizer; class SwXMailMerge : - public cppu::WeakImplHelper6 + public cppu::WeakImplHelper < com::sun::star::task::XJob, com::sun::star::util::XCancellable, |