io: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: Iad03db6b729a785ab8b29a69943fa45f5a36b21b
Reviewed-on: https://gerrit.libreoffice.org/17849
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

16 files changed, 40 insertions, 45 deletions

diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index 15a59bca05fe..89fc32091571 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -23,7 +23,7 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include "com/sun/star/uno/RuntimeException.hdl"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppunit/TestAssert.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
@@ -34,7 +34,7 @@
 
 namespace {
 
-class Input: public cppu::WeakImplHelper1<css::io::XInputStream> {
+class Input: public cppu::WeakImplHelper<css::io::XInputStream> {
 public:
     Input(): open_(true), index_(0) {}
 
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index dfe601ba4978..75e68711f47d 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -23,7 +23,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -53,7 +53,7 @@ namespace io_TextInputStream
 #define INITIAL_UNICODE_BUFFER_CAPACITY     0x100
 #define READ_BYTE_COUNT                     0x100
 
-class OTextInputStream : public WeakImplHelper2< XTextInputStream2, XServiceInfo >
+class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo >
 {
     Reference< XInputStream > mxStream;
 
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 846b5958e5fd..2c9377e96971 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -23,7 +23,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -50,7 +50,7 @@ namespace io_TextOutputStream
 
 // Implementation XTextOutputStream
 
-class OTextOutputStream : public WeakImplHelper2< XTextOutputStream2, XServiceInfo >
+class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInfo >
 {
     Reference< XOutputStream > mxStream;
 
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 1265d0e8b498..8fb7505a7ee3 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -23,7 +23,7 @@
 
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::osl;
 using namespace ::cppu;
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::io;
 namespace io_acceptor
 {
 
-    typedef WeakImplHelper1< XConnection > MyPipeConnection;
+    typedef WeakImplHelper< XConnection > MyPipeConnection;
 
     class PipeConnection :
         public MyPipeConnection
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index aaecf3cc72d6..103b1dd40b07 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/connection/XConnectionBroadcaster.hpp>
 #include <com/sun/star/connection/ConnectionSetupException.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::osl;
 using namespace ::cppu;
@@ -63,7 +63,7 @@ namespace io_acceptor {
             XStreamListener_hash_set;
 
 
-    class SocketConnection : public ::cppu::WeakImplHelper2<
+    class SocketConnection : public ::cppu::WeakImplHelper<
         ::com::sun::star::connection::XConnection,
         ::com::sun::star::connection::XConnectionBroadcaster>
 
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index b6db1a59a11e..1c4b2301c351 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -22,7 +22,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/unourl.hxx"
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::connection;
 
 namespace io_acceptor
 {
-    class OAcceptor : public WeakImplHelper2< XAcceptor, XServiceInfo >
+    class OAcceptor : public WeakImplHelper< XAcceptor, XServiceInfo >
     {
     public:
         OAcceptor(const Reference< XComponentContext > & xCtx);
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index cc79077cb1b6..0bedf4dde13e 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -22,7 +22,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/unourl.hxx"
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::connection;
 
 namespace stoc_connector
 {
-    class OConnector : public WeakImplHelper2< XConnector, XServiceInfo >
+    class OConnector : public WeakImplHelper< XConnector, XServiceInfo >
     {
         Reference< XMultiComponentFactory > _xSMgr;
         Reference< XComponentContext > _xCtx;
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index fe059bd4a8d0..820d9b730c6e 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR_HXX
 #define INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/connection/XConnection.hpp>
 #include <com/sun/star/connection/XConnectionBroadcaster.hpp>
@@ -57,7 +56,7 @@ namespace stoc_connector
             XStreamListener_hash_set;
 
     class PipeConnection :
-        public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
+        public ::cppu::WeakImplHelper< ::com::sun::star::connection::XConnection >
 
     {
     public:
@@ -86,7 +85,7 @@ namespace stoc_connector
     };
 
     class SocketConnection :
-        public ::cppu::WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster >
+        public ::cppu::WeakImplHelper< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster >
 
     {
     public:
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index ca2bc78423fa..892c7968610d 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -23,8 +23,7 @@
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/endian.h>
 
@@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang;
 namespace io_stm {
 
 class ODataInputStream :
-    public WeakImplHelper4 <
+    public WeakImplHelper <
                               XDataInputStream,
                               XActiveDataSink,
                               XConnectable,
@@ -496,7 +495,7 @@ Sequence<OUString> ODataInputStream_getSupportedServiceNames()
 
 
 class ODataOutputStream :
-    public WeakImplHelper4 <
+    public WeakImplHelper <
              XDataOutputStream,
              XActiveDataSource,
              XConnectable,
@@ -910,7 +909,7 @@ typedef std::unordered_map
 > ObjectContainer_Impl;
 
 class OObjectOutputStream:
-    public ImplInheritanceHelper2<
+    public ImplInheritanceHelper<
             ODataOutputStream, /* parent */
             XObjectOutputStream, XMarkableStream >
 {
@@ -1177,7 +1176,7 @@ Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std:
 }
 
 class OObjectInputStream:
-    public ImplInheritanceHelper2<
+    public ImplInheritanceHelper<
         ODataInputStream, /* parent */
         XObjectInputStream, XMarkableStream >
 {
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 9f1a5df600a1..4871333ae8aa 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -31,7 +31,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <osl/mutex.hxx>
@@ -66,7 +66,7 @@ namespace io_stm {
 *
 **********************/
 class OMarkableOutputStream :
-    public WeakImplHelper5< XOutputStream ,
+    public WeakImplHelper< XOutputStream ,
                             XActiveDataSource ,
                             XMarkableStream ,
                             XConnectable,
@@ -479,7 +479,7 @@ Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames()
 
 
 class OMarkableInputStream :
-    public WeakImplHelper5
+    public WeakImplHelper
     <
              XInputStream,
              XActiveDataSink,
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 5c8af3e6e79c..3b80057849d6 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <osl/conditn.hxx>
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::lang;
 namespace io_stm{
 
 class OPipeImpl :
-    public WeakImplHelper3< XPipe , XConnectable , XServiceInfo >
+    public WeakImplHelper< XPipe , XConnectable , XServiceInfo >
 {
 public:
     OPipeImpl( );
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index f67d19497e5f..d540455077ae 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -33,7 +33,7 @@
 
 #include <uno/dispatcher.h>
 #include <uno/mapping.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -53,7 +53,7 @@ using namespace com::sun::star::io;
 
 namespace io_stm {
 
-    class Pump : public WeakImplHelper5<
+    class Pump : public WeakImplHelper<
           XActiveDataSource, XActiveDataSink, XActiveDataControl, XConnectable, XServiceInfo >
     {
         Mutex                                   m_aMutex;
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 559f3e2a3c4a..a06b4d565ff8 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -32,8 +32,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -61,7 +60,7 @@ using namespace ::com::sun::star::beans;
  */
 
 class ODataStreamTest :
-        public WeakImplHelper1< XSimpleTest >
+        public WeakImplHelper< XSimpleTest >
 {
 public:
     ODataStreamTest( const Reference < XMultiServiceFactory > & rFactory ) :
@@ -367,7 +366,7 @@ OUString    ODataStreamTest_getImplementationName( int i) throw ()
     }
 }
 
-class MyPersistObject : public WeakImplHelper2< XPersistObject , XPropertySet >
+class MyPersistObject : public WeakImplHelper< XPersistObject , XPropertySet >
 {
 public:
     MyPersistObject( ) : m_sServiceName( OMyPersistObject_getServiceName() ) ,
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index d743e32bf3a4..f481c31bc860 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -26,9 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -44,7 +42,7 @@ using namespace ::com::sun::star::test;
 #include "testfactreg.hxx"
 
 
-class OMarkableOutputStreamTest : public WeakImplHelper1< XSimpleTest >
+class OMarkableOutputStreamTest : public WeakImplHelper< XSimpleTest >
 {
 public:
     OMarkableOutputStreamTest( const Reference< XMultiServiceFactory > & rFactory );
@@ -403,7 +401,7 @@ OUString    OMarkableOutputStreamTest_getImplementationName() throw ()
 // Input stream
 
 
-class OMarkableInputStreamTest : public WeakImplHelper1< XSimpleTest >
+class OMarkableInputStreamTest : public WeakImplHelper< XSimpleTest >
 {
 public:
     OMarkableInputStreamTest( const Reference< XMultiServiceFactory > & rFactory );
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index f2ad64308ae5..2d9ee9f5091f 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -28,7 +28,7 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -91,7 +91,7 @@ private:
 
 
 
-class OPipeTest : public WeakImplHelper1 < XSimpleTest >
+class OPipeTest : public WeakImplHelper < XSimpleTest >
 {
 public:
     OPipeTest( const Reference< XMultiServiceFactory >  & rFactory );
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index 34a9a783ef8b..74d74dfaa272 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -34,7 +34,7 @@
 
 #include <uno/dispatcher.h>
 #include <uno/mapping.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
@@ -60,7 +60,7 @@ static void mywait()
     osl_yieldThread();
 }
 
-class OPumpTest : public WeakImplHelper1 < XSimpleTest >
+class OPumpTest : public WeakImplHelper < XSimpleTest >
 {
 public:
     OPumpTest( const Reference< XMultiServiceFactory >  & rFactory );
@@ -226,7 +226,7 @@ void OPumpTest::testSimple( const Reference < XInterface > &r )
 
 }
 
-class TestListener: public WeakImplHelper1< XStreamListener >
+class TestListener: public WeakImplHelper< XStreamListener >
 {
 public:
     sal_Bool m_bStarted;