unotools: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

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

11 files changed, 25 insertions, 27 deletions

diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index dd498fce5d32..08314b4ff55b 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -131,8 +131,7 @@
 #include <config_folders.h>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 08f2f7180c81..fd1c423c78d7 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 using namespace com::sun::star::configuration;
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #ifdef DBG_UTIL
 static inline void lcl_CFG_DBG_EXCEPTION(const sal_Char* cText, const Exception& rEx)
@@ -77,7 +77,7 @@ catch(const Exception& rEx)   \
 */
 
 namespace utl{
-    class ConfigChangeListener_Impl : public cppu::WeakImplHelper1
+    class ConfigChangeListener_Impl : public cppu::WeakImplHelper
     <
         com::sun::star::util::XChangesListener
     >
diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index 8cb17296df17..9e40618e317c 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_UNOTOOLS_SOURCE_CONFIG_ITEMHOLDER1_HXX
 
 #include <unotools/itemholderbase.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 
 class ItemHolder1 : private ItemHolderMutexBase
-                  , public  ::cppu::WeakImplHelper1< css::lang::XEventListener >
+                  , public  ::cppu::WeakImplHelper< css::lang::XEventListener >
 {
 
     // member
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 424b2be8a759..639200fab9c0 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -29,6 +29,7 @@
 #include <rtl/instance.hxx>
 #include "itemholder1.hxx"
 
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -70,7 +71,7 @@ static o3tl::enumarray<UserOptToken, char const *> vOptionNames = {
 
 std::weak_ptr<SvtUserOptions::Impl> SvtUserOptions::xSharedImpl;
 
-class SvtUserOptions::ChangeListener : public cppu::WeakImplHelper1<util::XChangesListener>
+class SvtUserOptions::ChangeListener : public cppu::WeakImplHelper<util::XChangesListener>
 {
 public:
     explicit ChangeListener (Impl& rParent): m_rParent(rParent) { }
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index 47796e6364a3..8ee8953a0345 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -21,7 +21,6 @@
 
 #include <vector>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
 using namespace com::sun::star::uno;
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index c8e68c2b06dd..144cb248b825 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/util/XCloseable.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <tools/diagnose_ex.h>
 
@@ -46,7 +46,7 @@ namespace utl
 
     //= CloseListener_Impl
 
-    typedef ::cppu::WeakImplHelper1 <   XCloseListener
+    typedef ::cppu::WeakImplHelper <   XCloseListener
                                     >   CloseListener_Base;
     class CloseListener_Impl : public CloseListener_Base
     {
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index b6785ac4ed63..cecb590c9828 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
 
@@ -56,7 +56,7 @@ namespace utl
 
         //= OObserverImpl
 
-        class OObserverImpl : public ::cppu::WeakImplHelper1< XTerminateListener >
+        class OObserverImpl : public ::cppu::WeakImplHelper< XTerminateListener >
         {
         public:
             static void ensureObservation();
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index f9be7465f3dc..316cc4fcf4f0 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -23,7 +23,7 @@
 
 #include <unotools/eventlisteneradapter.hxx>
 #include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace utl
 {
@@ -33,7 +33,7 @@ namespace utl
 
     //= OEventListenerImpl
 
-    class OEventListenerImpl : public ::cppu::WeakImplHelper1< XEventListener >
+    class OEventListenerImpl : public ::cppu::WeakImplHelper< XEventListener >
     {
     protected:
         OEventListenerAdapter*          m_pAdapter;
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 16756c2fa3ca..9390df81362d 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -23,7 +23,7 @@
 #include <unotools/sharedunocomponent.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/debug.hxx>
 
 namespace utl
@@ -64,7 +64,7 @@ namespace utl
         }
     }
 
-    typedef ::cppu::WeakImplHelper1 <   XCloseListener
+    typedef ::cppu::WeakImplHelper <   XCloseListener
                                     >   CloseableComponentImpl_Base;
     class CloseableComponentImpl : public CloseableComponentImpl_Base
     {
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index f8048fca0ea2..9aa6c40b35d4 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -27,14 +27,14 @@
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <osl/mutex.hxx>
 
 class SvStream;
 namespace utl { class TempFile; }
 
-typedef  ::cppu::WeakImplHelper5<   ::com::sun::star::io::XTempFile
+typedef  ::cppu::WeakImplHelper<   ::com::sun::star::io::XTempFile
                                     ,   ::com::sun::star::io::XInputStream
                                                   , ::com::sun::star::io::XOutputStream
                                                   , ::com::sun::star::io::XTruncate
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 4b64723e02b2..a6fe80a0ad06 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -48,8 +48,7 @@
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/inetmsg.hxx>
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -70,7 +69,7 @@ namespace utl
 /**
     Helper class for getting a XInputStream when opening a content
  */
-class UcbDataSink_Impl : public ::cppu::WeakImplHelper2< XActiveDataControl, XActiveDataSink >
+class UcbDataSink_Impl : public ::cppu::WeakImplHelper< XActiveDataControl, XActiveDataSink >
 {
     UcbLockBytesRef         m_xLockBytes;
 
@@ -96,7 +95,7 @@ public:
 /**
     Helper class for getting a XStream when opening a content
  */
-class UcbStreamer_Impl : public ::cppu::WeakImplHelper2< XActiveDataStreamer, XActiveDataControl >
+class UcbStreamer_Impl : public ::cppu::WeakImplHelper< XActiveDataStreamer, XActiveDataControl >
 {
     Reference < XStream >   m_xStream;
     UcbLockBytesRef         m_xLockBytes;
@@ -123,7 +122,7 @@ public:
 /**
     Helper class for managing interactions and progress when executing UCB commands
  */
-class UcbTaskEnvironment : public ::cppu::WeakImplHelper1< XCommandEnvironment >
+class UcbTaskEnvironment : public ::cppu::WeakImplHelper< XCommandEnvironment >
 {
     Reference< XInteractionHandler >                m_xInteractionHandler;
     Reference< XProgressHandler >                   m_xProgressHandler;
@@ -145,7 +144,7 @@ public:
 /**
     Helper class for property change notifies when executing UCB commands
 */
-class UcbPropertiesChangeListener_Impl : public ::cppu::WeakImplHelper1< XPropertiesChangeListener >
+class UcbPropertiesChangeListener_Impl : public ::cppu::WeakImplHelper< XPropertiesChangeListener >
 {
 public:
     UcbLockBytesRef         m_xLockBytes;
@@ -337,7 +336,7 @@ private:
 };
 
 class ModeratorsActiveDataStreamer
-    : public ::cppu::WeakImplHelper1<XActiveDataStreamer>
+    : public ::cppu::WeakImplHelper<XActiveDataStreamer>
 {
 public:
 
@@ -373,7 +372,7 @@ private:
 };
 
 class ModeratorsActiveDataSink
-    : public ::cppu::WeakImplHelper1<XActiveDataSink>
+    : public ::cppu::WeakImplHelper<XActiveDataSink>
 {
 public:
 
@@ -456,7 +455,7 @@ ModeratorsActiveDataStreamer::setStream (
 }
 
 class ModeratorsInteractionHandler
-    : public ::cppu::WeakImplHelper1<XInteractionHandler>
+    : public ::cppu::WeakImplHelper<XInteractionHandler>
 {
 public: