diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-03 17:34:19 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-05 07:00:14 +0000 |
| commit | aecdaa718612285306335e307b242d6b9166052e (patch) | |
| tree | 941a67128da9e17435ff76186f57ef7d9bd4ed08 /embedserv | |
| parent | 62de18ab98289fc80984299f13ad71e4a4452ea3 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/inc/docholder.hxx | 4 | ||||
| -rw-r--r-- | embedserv/source/inc/intercept.hxx | 4 | ||||
| -rw-r--r-- | embedserv/source/inc/xwin.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 4ab0468a2556..c1fdc245ce0a 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 83454f002473..795b344aa8d5 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 aa666dff0a79..854a8327b15d 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> { |