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 /writerperfect | |
| 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 'writerperfect')
| -rw-r--r-- | writerperfect/inc/ImportFilter.hxx | 9 | ||||
| -rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.hxx | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index 595936df949b..6a5bde65c0af 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -28,8 +28,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <osl/diagnose.h> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <unotools/mediadescriptor.hxx> @@ -47,7 +46,7 @@ namespace detail { template<class Generator> -class ImportFilterImpl : public cppu::WeakImplHelper4 +class ImportFilterImpl : public cppu::WeakImplHelper < com::sun::star::document::XFilter, com::sun::star::document::XImporter, @@ -192,10 +191,10 @@ private: /** A base class for import filters. */ template<class Generator> -struct ImportFilter : public cppu::ImplInheritanceHelper1<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo> +struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo> { ImportFilter(const css::uno::Reference<css::uno::XComponentContext> &rxContext) - : cppu::ImplInheritanceHelper1<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>(rxContext) + : cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>(rxContext) { } }; diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index ed96f4e2ae94..d048fe796222 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -20,13 +20,12 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> /* This component will be instantiated for both import or export. Whether it calls * setSourceDocument or setTargetDocument determines which Impl function the filter * member calls */ -class WordPerfectImportFilter : public cppu::WeakImplHelper5 +class WordPerfectImportFilter : public cppu::WeakImplHelper < com::sun::star::document::XFilter, com::sun::star::document::XImporter, @@ -91,7 +90,7 @@ SAL_CALL WordPerfectImportFilter_createInstance(const ::com::sun::star::uno::Ref throw (::com::sun::star::uno::Exception); -class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 < +class WordPerfectImportFilterDialog : public cppu::WeakImplHelper < com::sun::star::ui::dialogs::XExecutableDialog, com::sun::star::lang::XServiceInfo, com::sun::star::beans::XPropertyAccess |