sax: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

Change-Id: Id8d0c61b0454652abbbd09be0c72696a057dc2d2
Reviewed-on: https://gerrit.libreoffice.org/18008
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 481e46fbcc10..525659d9fde9 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -64,7 +64,7 @@ sal_Int16 AttributeList::getLength() throw (RuntimeException, std::exception)
 
 
 AttributeList::AttributeList( const AttributeList &r ) :
-    cppu::WeakImplHelper2<XAttributeList, XCloneable>()
+    cppu::WeakImplHelper<XAttributeList, XCloneable>()
 {
     m_pImpl = new AttributeList_impl;
     *m_pImpl = *(r.m_pImpl);
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index a03985e0c669..e3afa15cbf08 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SAX_SOURCE_EXPATWRAP_ATTRLISTIMPL_HXX
 
 #include "sal/config.h"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -33,7 +33,7 @@ struct AttributeList_impl;
 
 //FIXME
 class AttributeList :
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper<
                 ::com::sun::star::xml::sax::XAttributeList,
                 ::com::sun::star::util::XCloneable >
 {
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 8bbfd24fee66..c02ee87bbad1 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
@@ -138,7 +138,7 @@ class SaxExpatParser_Impl;
 
 // This class implements the external Parser interface
 class SaxExpatParser
-    : public WeakImplHelper3< XInitialization
+    : public WeakImplHelper< XInitialization
                             , XServiceInfo
                             , XParser >
 {
@@ -357,7 +357,7 @@ extern "C"
 // LocatorImpl
 
 class LocatorImpl :
-    public WeakImplHelper2< XLocator, com::sun::star::io::XSeekable >
+    public WeakImplHelper< XLocator, com::sun::star::io::XSeekable >
     // should use a different interface for stream positions!
 {
 public:
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index f1d418a3fa10..42151196990d 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/io/XActiveDataSource.hpp>
 
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <osl/diagnose.h>
@@ -869,7 +869,7 @@ static inline sal_Int32 getFirstLineBreak( const OUString & str ) throw ()
 }
 
 class SAXWriter :
-    public WeakImplHelper2<
+    public WeakImplHelper<
             XWriter,
             XServiceInfo >
 {
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index c866618ea4f0..04ec93133225 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/conditn.hxx>
@@ -329,7 +330,7 @@ static int call_callbackExternalEntityRef( XML_Parser parser,
 #endif
 }
 
-class FastLocatorImpl : public WeakImplHelper1< XLocator >
+class FastLocatorImpl : public WeakImplHelper< XLocator >
 {
 public:
     FastLocatorImpl( FastSaxParserImpl *p ) : mpParser(p) {}