diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-22 23:48:08 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-23 07:16:39 +0000 |
| commit | 4ee98aec9f1835bba6eaab9e982c255e8c99be1e (patch) | |
| tree | 8c076106bbae600da5b9442ccf0e9938487d5cef /desktop/source/migration | |
| parent | 62824a22161501a62b950ed461dc5839fa5ea942 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants in desktop.
Change-Id: I84d4c4b36fff95b5e1646f4df731d0b83ee1fe3e
Reviewed-on: https://gerrit.libreoffice.org/17301
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop/source/migration')
4 files changed, 9 insertions, 10 deletions
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index e71171f5f8dc..adec67a75215 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> @@ -48,7 +48,7 @@ namespace migration // class BasicMigration - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::task::XJob > BasicMigration_BASE; diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 8b56c7a1858b..adee3c883ff8 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -18,7 +18,7 @@ */ -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> @@ -78,7 +78,7 @@ CJavaInfo::~CJavaInfo() -class JavaMigration : public ::cppu::WeakImplHelper4< +class JavaMigration : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, css::task::XJob, diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index ad04d8318ddd..2d2adc19efda 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -31,8 +31,7 @@ #include <osl/mutex.hxx> #include <osl/file.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <ucbhelper/content.hxx> namespace com { namespace sun { namespace star { @@ -57,7 +56,7 @@ namespace migration // class ExtensionMigration - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::task::XJob > ExtensionMigration_BASE; @@ -111,7 +110,7 @@ namespace migration }; class TmpRepositoryCommandEnv - : public ::cppu::WeakImplHelper3< ::com::sun::star::ucb::XCommandEnvironment, + : public ::cppu::WeakImplHelper< ::com::sun::star::ucb::XCommandEnvironment, ::com::sun::star::task::XInteractionHandler, ::com::sun::star::ucb::XProgressHandler > { diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 503f9c338859..435221408faf 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> @@ -48,7 +48,7 @@ namespace migration // class WordbookMigration - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::task::XJob > WordbookMigration_BASE; |