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

with the variadic variants.

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

9 files changed, 12 insertions, 13 deletions

diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index eae8f131b22c..aa2e54cdec53 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -34,7 +34,7 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxwindows.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
 
@@ -42,7 +42,7 @@ namespace svt { namespace table {
     class TableControl;
 } }
 
-typedef ::cppu::ImplInheritanceHelper4  <   VCLXWindow
+typedef ::cppu::ImplInheritanceHelper  <   VCLXWindow
                                         ,   ::com::sun::star::awt::grid::XGridControl
                                         ,   ::com::sun::star::awt::grid::XGridRowSelection
                                         ,   ::com::sun::star::awt::grid::XGridDataListener
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 848222d4a60b..5e11c720454d 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -29,6 +29,7 @@
 #include "treecontrolpeer.hxx"
 #include <comphelper/processfactory.hxx>
 
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
@@ -611,7 +612,7 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException,
 
 
 
-class TreeSelectionEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
+class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
 {
 public:
     explicit TreeSelectionEnumeration( std::list< Any >& rSelection );
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 13424293d87e..7e8626fa5aea 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -29,7 +29,7 @@
 
 #include <vcl/image.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <tools/contnr.hxx>
 
@@ -45,7 +45,7 @@ class UnoTreeListEntry;
 class TreeControlPeer;
 class UnoTreeListBoxImpl;
 
-class TreeControlPeer : public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener >
+class TreeControlPeer : public ::cppu::ImplInheritanceHelper< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener >
 {
     typedef std::map<com::sun::star::uno::Reference<com::sun::star::awt::tree::XTreeNode>, UnoTreeListEntry*> TreeNodeMap;
 
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index 50610a02793a..229c7e0a1e9a 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 
-#include <cppuhelper/implbase2.hxx>
 #include <rtl/ref.hxx>
 
 #include <boost/noncopyable.hpp>
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 842a07331cfd..6d9cb1f3cfbb 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -34,7 +34,6 @@ using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::lang::WrappedTargetException;
 using ::com::sun::star::lang::XServiceInfo;
 using ::com::sun::star::beans::PropertyValue;
-using ::cppu::WeakImplHelper2;
 
 
 const sal_Char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index b0a3e7d7172a..7e19c7baa6d7 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -32,6 +32,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <boost/noncopyable.hpp>
 
 
@@ -90,7 +91,7 @@ namespace svt { namespace table
 
     //= ColumnChangeMultiplexer
 
-    typedef ::cppu::WeakImplHelper1 <   XGridColumnListener
+    typedef ::cppu::WeakImplHelper <   XGridColumnListener
                                     >   ColumnChangeMultiplexer_Base;
     class ColumnChangeMultiplexer   :public ColumnChangeMultiplexer_Base
                                     ,public ::boost::noncopyable
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index fbf27481ee0d..6761e4bbbaf4 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/style/HorizontalAlignment.hpp>
 
-#include <cppuhelper/implbase2.hxx>
 #include <rtl/ref.hxx>
 
 #include <boost/noncopyable.hpp>
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index a0e9f2c12099..3e3aceb5d15c 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <list>
 #include <osl/mutex.hxx>
@@ -519,7 +519,7 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents()
 
 
 
-class SvUnoImageMap : public WeakImplHelper3< XIndexContainer, XServiceInfo, XUnoTunnel >
+class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel >
 {
 public:
     explicit SvUnoImageMap( const SvEventDescription* pSupportedMacroItems );
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 308d5c6379dc..d5efdb4df893 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>
 #include <com/sun/star/ui/dialogs/WizardButton.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svtools/genericunodialog.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/ref.hxx>
@@ -88,7 +88,7 @@ namespace {
         }
     }
 
-    typedef ::cppu::ImplInheritanceHelper1  <   ::svt::OGenericUnoDialog
+    typedef ::cppu::ImplInheritanceHelper  <   ::svt::OGenericUnoDialog
                                             ,   ui::dialogs::XWizard
                                             >   Wizard_Base;
     class Wizard;