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/uno | |
| 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/uno')
| -rw-r--r-- | sw/source/uibase/uno/unomailmerge.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unomodule.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 609414bd3262..38390117bc58 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/mail/XSmtpService.hpp> #include <sfx2/viewfrm.hxx> #include <sfx2/event.hxx> +#include <cppuhelper/implbase.hxx> #include <swevent.hxx> #include <unomailmerge.hxx> #include <swdll.hxx> @@ -184,7 +185,7 @@ static bool LoadFromURL_impl( namespace { - class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >, + class DelayedFileDeletion : public ::cppu::WeakImplHelper< util::XCloseListener >, private boost::noncopyable { protected: diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 424871a2d213..8d7c29654f4b 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/uno/Reference.h> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -48,7 +48,7 @@ namespace com } } -class SwUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo > +class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo > { css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory; |