diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-15 10:08:55 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-15 06:19:28 +0000 |
| commit | ee7da352b885cfead32abb3fd111acead0c32816 (patch) | |
| tree | 1609401dc01cc76a53a65b033827cfbe42fd1d0b /desktop | |
| parent | 5bbff06137a87e97260a188f6745cf2a227f15cf (diff) | |
Resolves: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I7154f9472f02fdf47d27ba715db55bb1ec669a8a
Reviewed-on: https://gerrit.libreoffice.org/18580
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 6 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 06da72a3b274..ee36e84aa61e 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -59,7 +59,7 @@ namespace { class Provider: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< css::lang::XServiceInfo, css::frame::XDispatchProvider >, private boost::noncopyable { @@ -150,7 +150,7 @@ Provider::queryDispatches( } class Dispatch: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< css::lang::XServiceInfo, css::frame::XDispatch >, private boost::noncopyable { diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 70b11ccebc03..6cbff6982c15 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -56,7 +56,7 @@ namespace { class Provider: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< css::lang::XServiceInfo, css::frame::XDispatchProvider >, private boost::noncopyable { @@ -147,7 +147,7 @@ Provider::queryDispatches( } class Dispatch: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< css::lang::XServiceInfo, css::frame::XDispatch >, private boost::noncopyable { |