svl: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

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

8 files changed, 19 insertions, 21 deletions

diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index dc1b13df3317..95de5f76dd8d 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -95,7 +95,7 @@
 #include <comphelper/sharedmutex.hxx>
 #include <comphelper/string.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index cedebdfe322d..b221b54feb16 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -38,8 +38,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "cppunit/TestCase.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/TestSuite.h"
@@ -66,7 +65,7 @@ namespace {
 // This class only implements that subset of functionality of a proper
 // css::ucb::Content that is known to be needed here:
 class Content:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::ucb::XContent, css::ucb::XCommandProcessor >
 {
 public:
@@ -169,7 +168,7 @@ css::uno::Any Content::execute(
     return css::uno::makeAny(uri.toAsciiLowerCase());
 }
 
-class Provider: public cppu::WeakImplHelper1< css::ucb::XContentProvider > {
+class Provider: public cppu::WeakImplHelper< css::ucb::XContentProvider > {
 public:
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
         css::uno::Reference< css::ucb::XContentIdentifier > const & identifier)
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index a4f837270bd1..c3a2d595c513 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
 
 #include <unotools/itemholderbase.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 
 class ItemHolder2 : private ItemHolderMutexBase
-                  , public  ::cppu::WeakImplHelper1< css::lang::XEventListener >
+                  , public  ::cppu::WeakImplHelper< css::lang::XEventListener >
 {
     // member
     private:
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 1510387e4a57..d5d100b0c30f 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/io/XSeekable.hpp>
 
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <osl/mutex.hxx>
 
-class OFSInputStreamContainer : public cppu::WeakImplHelper2 < ::com::sun::star::io::XInputStream
+class OFSInputStreamContainer : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream
                                                             ,::com::sun::star::embed::XExtendedStorageStream >
                             , public ::com::sun::star::io::XSeekable
 {
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index eb8e11ea2a28..b124717f9525 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -24,10 +24,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 
-class FSStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
+class FSStorageFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleServiceFactory,
                                                 ::com::sun::star::lang::XServiceInfo >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index fdef4f422327..7ba4e66c0e40 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/factory.hxx>
@@ -232,7 +232,7 @@ enum PasswordState {
     cancelled
 };
 
-class PasswordContainer : public ::cppu::WeakImplHelper3<
+class PasswordContainer : public ::cppu::WeakImplHelper<
         ::com::sun::star::task::XPasswordContainer2,
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XEventListener >
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 9d9252a753df..3339c41603d8 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -26,8 +26,7 @@
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/sharedmutex.hxx>
 #include <rtl/ref.hxx>
 #include <tools/solar.h>
@@ -38,7 +37,7 @@ class SvNumberFormatsSupplierObj;
 /**
  * SvNumberFormatterServiceObj is registered globally as a Service
  */
-class SvNumberFormatterServiceObj : public cppu::WeakImplHelper2<
+class SvNumberFormatterServiceObj : public cppu::WeakImplHelper<
                                         com::sun::star::util::XNumberFormatter2,
                                         com::sun::star::lang::XServiceInfo>
 {
@@ -101,7 +100,7 @@ public:
 };
 
 
-class SvNumberFormatsObj : public cppu::WeakImplHelper3<
+class SvNumberFormatsObj : public cppu::WeakImplHelper<
                                         com::sun::star::util::XNumberFormats,
                                         com::sun::star::util::XNumberFormatTypes,
                                         com::sun::star::lang::XServiceInfo>
@@ -167,7 +166,7 @@ private:
 };
 
 
-class SvNumberFormatObj : public cppu::WeakImplHelper3<
+class SvNumberFormatObj : public cppu::WeakImplHelper<
                                         com::sun::star::beans::XPropertySet,
                                         com::sun::star::beans::XPropertyAccess,
                                         com::sun::star::lang::XServiceInfo>
@@ -243,7 +242,7 @@ public:
 };
 
 
-class SvNumberFormatSettingsObj : public cppu::WeakImplHelper2<
+class SvNumberFormatSettingsObj : public cppu::WeakImplHelper<
                                         com::sun::star::beans::XPropertySet,
                                         com::sun::star::lang::XServiceInfo>
 {
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 00e81d8915fb..3251dd9351c0 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -21,7 +21,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
-class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo >
+class PathService : public ::cppu::WeakImplHelper< css::frame::XConfigManager, css::lang::XServiceInfo >
 {
     SvtPathOptions m_aOptions;