From 678bb5135bf99a295c38060aa003e81a8c3b435a Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 8 Aug 2015 10:53:34 +0900 Subject: tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants, for filter. Change-Id: I30dcd7cfb3e484034f6cceceb1ff7cd9d3f4b7a6 Reviewed-on: https://gerrit.libreoffice.org/17585 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/config/cache/basecontainer.hxx | 8 ++++---- filter/source/config/cache/cacheupdatelistener.hxx | 4 ++-- filter/source/config/cache/configflush.hxx | 4 ++-- filter/source/config/cache/contenthandlerfactory.hxx | 4 ++-- filter/source/config/cache/filterfactory.hxx | 4 ++-- filter/source/config/cache/frameloaderfactory.hxx | 4 ++-- filter/source/config/cache/typedetection.hxx | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'filter/source/config/cache') diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 2e385423c4f1..cf42c4042729 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -54,7 +54,7 @@ namespace filter{ ctor as first! */ class BaseContainer : public BaseLock - , public ::cppu::WeakImplHelper4< css::lang::XServiceInfo , + , public ::cppu::WeakImplHelper< css::lang::XServiceInfo , css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess css::container::XContainerQuery , css::util::XFlushable > @@ -114,7 +114,7 @@ class BaseContainer : public BaseLock /** @short standard ctor. @descr Because mostly this class is used as base class for own service - implementations in combination with a ImplInheritanceHelper2 template ... + implementations in combination with a ImplInheritanceHelper template ... there is no way to provide some initializing data through the ctor :-( This base class will be created inside its default ctor and must be initialized with its needed parameters explicitly by calling: "init()". @@ -134,7 +134,7 @@ class BaseContainer : public BaseLock /** @short initialize this generic intsnace with some specialized values from our derived object. - @descr Because an outside class must use ImplInheritanceHelper2 template to + @descr Because an outside class must use ImplInheritanceHelper template to use us a base class ... and there is no way to pass such initializing parameters through a required default ctor ... we must be initialized by this special method. Of course this method must be called first before diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index a6b2e7410110..4429a246f8a4 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace filter{ @@ -37,7 +37,7 @@ namespace filter{ wa changed by other processes. */ class CacheUpdateListener : public BaseLock // must be the first one to guarantee right initialized mutex member! - , public ::cppu::WeakImplHelper1< css::util::XChangesListener > + , public ::cppu::WeakImplHelper< css::util::XChangesListener > { // member diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index a4583d01685b..730671d79266 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace filter{ @@ -40,7 +40,7 @@ namespace filter{ type/filter configuration will be changed at runtime. */ class ConfigFlush : public BaseLock - , public ::cppu::WeakImplHelper2< + , public ::cppu::WeakImplHelper< css::util::XRefreshable, css::lang::XServiceInfo > diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index d5261e6249de..ee7d2b28f0ad 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -23,7 +23,7 @@ #include "basecontainer.hxx" #include #include -#include +#include namespace filter{ @@ -34,7 +34,7 @@ namespace filter{ /** @short implements the service ContentHandlerFactory. */ -class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , +class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , css::frame::XLoaderFactory > { diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 5aefbc58d76c..9adeb638677b 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -24,7 +24,7 @@ #include "querytokenizer.hxx" #include #include -#include +#include namespace filter{ @@ -35,7 +35,7 @@ namespace filter{ /** @short implements the service FilterFactory. */ -class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , +class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , css::lang::XMultiServiceFactory > { diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 1a72081d8cc4..71553ca743df 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -23,7 +23,7 @@ #include "basecontainer.hxx" #include #include -#include +#include namespace filter{ @@ -34,7 +34,7 @@ namespace filter{ /** @short implements the service FrameLoaderFactory. */ -class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , +class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , css::frame::XLoaderFactory > { diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index d9c6a63ba02e..f433a796ec64 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace filter{ namespace config { @@ -34,7 +34,7 @@ namespace filter{ namespace config { /** @short implements the service TypeDetection. */ -class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer , +class TypeDetection : public ::cppu::ImplInheritanceHelper< BaseContainer , css::document::XTypeDetection > { -- cgit v1.2.3