embedserv/source/inc/docholder.hxx | 4 ++-- embedserv/source/inc/intercept.hxx | 4 ++-- embedserv/source/inc/xwin.hxx | 4 ++-- eventattacher/source/eventattacher.cxx | 9 ++++----- 4 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit aecdaa718612285306335e307b242d6b9166052e Author: Takeshi Abe <[email protected]> Date: Mon Aug 3 17:34:19 2015 +0900 tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants in embedserv and eventattacher. Change-Id: I556ad208a7ffcf85c484e298cdbb1324b8a6a659 Reviewed-on: https://gerrit.libreoffice.org/17499 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 4ab0468..c1fdc24 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/frame/XFrame2.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> @@ -43,7 +43,7 @@ namespace winwrap { class DocumentHolder : - public ::cppu::WeakImplHelper4< + public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener, ::com::sun::star::frame::XTerminateListener, ::com::sun::star::util::XModifyListener, diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index 83454f0..795b344 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -21,7 +21,7 @@ #define INCLUDED_EMBEDSERV_SOURCE_INC_INTERCEPT_HXX #include <osl/mutex.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XInterceptorInfo.hpp> @@ -36,7 +36,7 @@ class EmbedDocument_Impl; class DocumentHolder; class Interceptor - : public ::cppu::WeakImplHelper3< + : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor, ::com::sun::star::frame::XInterceptorInfo, ::com::sun::star::frame::XDispatch> diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx index aa666df..854a832 100644 --- a/embedserv/source/inc/xwin.hxx +++ b/embedserv/source/inc/xwin.hxx @@ -24,13 +24,13 @@ #include "common.h" #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> class ContainerWindowWrapper: - public ::cppu::WeakImplHelper2< + public ::cppu::WeakImplHelper< ::com::sun::star::awt::XWindow, ::com::sun::star::awt::XSystemDependentWindowPeer> { diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 6dcae48..207626d 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -36,8 +36,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> using namespace com::sun::star::uno; @@ -60,7 +59,7 @@ namespace comp_EventAttacher { // class InvocationToAllListenerMapper // helper class to map XInvocation to XAllListener -class InvocationToAllListenerMapper : public WeakImplHelper1< XInvocation > +class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation > { public: InvocationToAllListenerMapper( const Reference< XIdlClass >& ListenerType, @@ -209,7 +208,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam // class EventAttacherImpl // represents an implementation of the EventAttacher service -class EventAttacherImpl : public WeakImplHelper3 < XEventAttacher2, XInitialization, XServiceInfo > +class EventAttacherImpl : public WeakImplHelper < XEventAttacher2, XInitialization, XServiceInfo > { public: EventAttacherImpl( const Reference< XComponentContext >& ); @@ -431,7 +430,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception ) // Implementation of an EventAttacher-related AllListeners, which brings // a few Events to a general AllListener -class FilterAllListenerImpl : public WeakImplHelper1< XAllListener > +class FilterAllListenerImpl : public WeakImplHelper< XAllListener > { public: FilterAllListenerImpl( EventAttacherImpl * pEA_, const OUString& EventMethod_, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
