tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants in desktop.

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

7 files changed, 14 insertions, 14 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index d18f86b94125..e0a4f1a45453 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -38,7 +38,7 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
@@ -244,7 +244,7 @@ public:
 };
 
 
-class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XExecutableDialog >
+class UpdateRequiredDialogService : public ::cppu::WeakImplHelper< ::com::sun::star::ui::dialogs::XExecutableDialog >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParent;
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 3ff721489ea7..39ffeffd37ff 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -59,7 +59,7 @@
 #include <salhelper/thread.hxx>
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/anytostring.hxx>
 #include <vcl/layout.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -114,7 +114,7 @@ namespace dp_gui {
 
 
 class ProgressCmdEnv
-    : public ::cppu::WeakImplHelper3< ucb::XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment,
                                       task::XInteractionHandler,
                                       ucb::XProgressHandler >
 {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index bb8d94672b57..433f557a40b5 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -27,7 +27,7 @@
 #include <vcl/dialog.hxx>
 
 #include <svtools/extensionlistbox.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <unotools/collatorwrapper.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
@@ -90,7 +90,7 @@ struct Entry_Impl
 class ExtensionBox_Impl;
 
 
-class ExtensionRemovedListener : public ::cppu::WeakImplHelper1<css::lang::XEventListener>
+class ExtensionRemovedListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
 {
     VclPtr<ExtensionBox_Impl>   m_pParent;
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 616b97922368..d669fb4096e4 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -21,7 +21,7 @@
 #include "dp_gui_shared.hxx"
 #include "dp_gui.h"
 #include "dp_gui_theextmgr.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/processfactory.hxx>
@@ -138,7 +138,7 @@ OUString ReplaceProductNameHookProc( const OUString& rStr )
 
 
 class ServiceImpl
-    : public ::cppu::WeakImplHelper2<ui::dialogs::XAsynchronousExecutableDialog,
+    : public ::cppu::WeakImplHelper<ui::dialogs::XAsynchronousExecutableDialog,
                                      task::XJobExecutor>
 {
     Reference<XComponentContext> const m_xComponentContext;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index cde3202025e2..76bcc1f9be1a 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -22,7 +22,7 @@
 
 #include <comphelper/sequence.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/deployment/XExtensionManager.hpp>
@@ -44,7 +44,7 @@ class ExtensionCmdQueue;
 
 
 class TheExtensionManager :
-    public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XTerminateListener,
+    public ::cppu::WeakImplHelper< ::com::sun::star::frame::XTerminateListener,
                                     ::com::sun::star::util::XModifyListener >
 {
 private:
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 69c49d8bbeac..0c8d665842a3 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -29,7 +29,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -113,7 +113,7 @@ private:
 };
 
 class UpdateCommandEnv
-    : public ::cppu::WeakImplHelper3< css::ucb::XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< css::ucb::XCommandEnvironment,
                                       css::task::XInteractionHandler,
                                       css::ucb::XProgressHandler >
 {
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index b63bd279d646..c482ee1481a3 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX
 
 #include "dp_gui.h"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
@@ -29,7 +29,7 @@
 namespace dp_gui {
 
 class LicenseDialog
-    : public ::cppu::WeakImplHelper1<css::ui::dialogs::XExecutableDialog>
+    : public ::cppu::WeakImplHelper<css::ui::dialogs::XExecutableDialog>
 {
     css::uno::Reference<css::uno::XComponentContext> const m_xComponentContext;
     css::uno::Reference<css::awt::XWindow> /* const */ m_parent;