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>

10 files changed, 25 insertions, 29 deletions

diff --git a/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx
index f51dce6f7d19..c4238c390a93 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.hxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx
@@ -66,8 +66,7 @@
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 6fc7c403bc72..6cdb37162a92 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmlscript/xml_helper.hxx>
 
 using namespace osl;
@@ -32,7 +32,7 @@ namespace xmlscript
 {
 
 class BSeqInputStream
-    : public ::cppu::WeakImplHelper1< io::XInputStream >
+    : public ::cppu::WeakImplHelper< io::XInputStream >
 {
     ByteSequence _seq;
     sal_Int32 _nPos;
@@ -98,7 +98,7 @@ void BSeqInputStream::closeInput()
 }
 
 class BSeqOutputStream
-    : public ::cppu::WeakImplHelper1< io::XOutputStream >
+    : public ::cppu::WeakImplHelper< io::XOutputStream >
 {
     ByteSequence * _seq;
 
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 38658be7501e..dfb58084243c 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -24,8 +24,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/xml/input/XAttributes.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -92,7 +91,7 @@ struct MGuard
 };
 
 class DocumentHandlerImpl :
-    public ::cppu::WeakImplHelper4< xml::sax::XDocumentHandler,
+    public ::cppu::WeakImplHelper< xml::sax::XDocumentHandler,
                                     xml::input::XNamespaceMapping,
                                     lang::XInitialization,
                                     com::sun::star::lang::XServiceInfo >
@@ -325,7 +324,7 @@ inline void DocumentHandlerImpl::getElementName(
 }
 
 class ExtendedAttributes :
-    public ::cppu::WeakImplHelper1< xml::input::XAttributes >
+    public ::cppu::WeakImplHelper< xml::input::XAttributes >
 {
     sal_Int32 m_nAttributes;
     sal_Int32 * m_pUids;
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index cec6fe51aebe..e09a72b9c2df 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -25,7 +25,7 @@
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <xmlscript/xmllib_imexp.hxx>
 #include <xmlscript/xmlmod_imexp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -111,7 +111,7 @@ inline bool getLongAttr(
 class ImportContext;
 
 struct DialogImport
-    : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
+    : public ::cppu::WeakImplHelper< css::xml::input::XRoot >
 {
     friend class ImportContext;
 
@@ -164,7 +164,7 @@ public:
         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
                       _xContext.is() ); }
     inline DialogImport( const DialogImport& rOther ) :
-        ::cppu::WeakImplHelper1< css::xml::input::XRoot >()
+        ::cppu::WeakImplHelper< css::xml::input::XRoot >()
         , _xContext( rOther._xContext )
         , _xSupplier( rOther._xSupplier )
         , _pStyleNames( rOther._pStyleNames )
@@ -200,7 +200,7 @@ public:
 };
 
 class ElementBase
-    : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
+    : public ::cppu::WeakImplHelper< css::xml::input::XElement >
 {
 protected:
     DialogImport * const _pImport;
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index bc4ff47d00b1..b6145581eca4 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/xml/sax/Writer.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmlscript/xml_helper.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 
@@ -36,7 +36,7 @@ namespace xmlscript
 {
 
 class InputStreamProvider
-    : public ::cppu::WeakImplHelper1< io::XInputStreamProvider >
+    : public ::cppu::WeakImplHelper< io::XInputStreamProvider >
 {
     ByteSequence _bytes;
 
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;
 
diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index 4be264a97ea9..19dba7d6db7a 100644
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
@@ -22,7 +22,7 @@
 
 #include <xmlscript/xmllib_imexp.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -102,7 +102,7 @@ inline bool getLongAttr(
 // Library import
 
 struct LibraryImport
-    : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
+    : public ::cppu::WeakImplHelper< css::xml::input::XRoot >
 {
     friend class LibrariesElement;
     friend class LibraryElement;
@@ -152,7 +152,7 @@ public:
 };
 
 class LibElementBase
-    : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
+    : public ::cppu::WeakImplHelper< css::xml::input::XElement >
 {
 protected:
     LibraryImport * _pImport;
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index ddcbea3f6459..2f33d80dcf5c 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -22,7 +22,7 @@
 
 #include <xmlscript/xmlmod_imexp.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -42,7 +42,7 @@ namespace xmlscript
 // Script module import
 
 struct ModuleImport
-    : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
+    : public ::cppu::WeakImplHelper< css::xml::input::XRoot >
 {
     friend class ModuleElement;
 
@@ -82,7 +82,7 @@ public:
 };
 
 class ModuleElement
-    : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
+    : public ::cppu::WeakImplHelper< css::xml::input::XElement >
 {
 protected:
     ModuleImport * _pImport;
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index 7621b5dece15..393d5a7b2f43 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -29,7 +29,6 @@
 
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/implbase2.hxx>
 
 #include <comphelper/processfactory.hxx>