diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-14 10:01:53 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-14 06:25:52 +0000 |
| commit | 06962719b172bbc55d77bb13295dff25826bb963 (patch) | |
| tree | 7472e4e0be21e62fbed34e7aaba1a568858f62ca /xmlscript/source/xmlflat_imexp | |
| parent | 889d825879d1f044986c00a8038196bdb53e50dd (diff) | |
xmlscript: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Ic05094dea12c0aa66dc97a7e403a3abec9e25785
Reviewed-on: https://gerrit.libreoffice.org/18556
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlscript/source/xmlflat_imexp')
| -rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 4 | ||||
| -rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index f3e92d523885..7216b003d6af 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> namespace xmlscript @@ -34,7 +34,7 @@ namespace xmlscript // class XMLBasicExporterBase - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::document::XXMLBasicExporter > XMLBasicExporterBase_BASE; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index a600e238023f..c0723ec66ee5 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -26,8 +26,7 @@ #include <com/sun/star/script/XLibraryContainer2.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/input/XRoot.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> @@ -38,7 +37,7 @@ namespace xmlscript class BasicImport; - typedef ::cppu::WeakImplHelper1< + typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::input::XElement > BasicElementBase_BASE; class BasicElementBase : public BasicElementBase_BASE @@ -181,7 +180,7 @@ namespace xmlscript // class BasicImport - typedef ::cppu::WeakImplHelper1< + typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::input::XRoot > BasicImport_BASE; class BasicImport : public BasicImport_BASE @@ -221,7 +220,7 @@ namespace xmlscript // class XMLBasicImporterBase - typedef ::cppu::WeakImplHelper2< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::document::XXMLOasisBasicImporter > XMLBasicImporterBase_BASE; |