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 /winaccessibility | |
| 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 'winaccessibility')
| -rw-r--r-- | winaccessibility/inc/AccEventListener.hxx | 4 | ||||
| -rw-r--r-- | winaccessibility/inc/AccTopWindowListener.hxx | 4 | ||||
| -rw-r--r-- | winaccessibility/source/service/msaaservice_impl.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index c656e3659533..f3f85131dd2f 100644 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> @@ -35,7 +35,7 @@ class AccObjectManagerAgent; * methods. */ class AccEventListener - : public ::cppu::WeakImplHelper1< + : public ::cppu::WeakImplHelper< com::sun::star::accessibility::XAccessibleEventListener> { protected: diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx index ecfd819e540a..1a52becf0e60 100644 --- a/winaccessibility/inc/AccTopWindowListener.hxx +++ b/winaccessibility/inc/AccTopWindowListener.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/awt/XExtendedToolkit.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "AccObjectManagerAgent.hxx" @@ -36,7 +36,7 @@ * cached into bridge managers, and they are monitored by listeners for later accessible event handling. */ class AccTopWindowListener - : public ::cppu::WeakImplHelper1<com::sun::star::awt::XTopWindowListener> + : public ::cppu::WeakImplHelper<com::sun::star::awt::XTopWindowListener> { private: AccObjectManagerAgent accManagerAgent; diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 36de815927c4..6493452128aa 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -18,7 +18,7 @@ */ #include <rtl/ref.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> @@ -57,7 +57,7 @@ static OUString getImplementationName_MSAAServiceImpl() return OUString( "com.sun.star.accessibility.my_sc_implementation.MSAAService" ); } -class MSAAServiceImpl : public ::cppu::WeakImplHelper2< +class MSAAServiceImpl : public ::cppu::WeakImplHelper< XMSAAService, lang::XServiceInfo > { private: |