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>

37 files changed, 82 insertions, 85 deletions

diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index c5e98ca3075a..c746eb367961 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -26,7 +26,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/timer.hxx>
@@ -68,7 +68,7 @@ namespace
 {
 //For use with XExtensionManager.synchronize
 class SilentCommandEnv
-    : public ::cppu::WeakImplHelper3< ucb::XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment,
                                       task::XInteractionHandler,
                                       ucb::XProgressHandler >
 {
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index d20579ea4258..0c31758d77a3 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX
 #define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <uno/current_context.hxx>
 
 namespace desktop
 {
-    class DesktopContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >
+    class DesktopContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext >
     {
     public:
     DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx);
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index e50372bad0fc..443eb19dc2b2 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
 #define INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 
@@ -43,7 +43,7 @@ class DispatchWatcherHashMap : public std::unordered_map< OUString, sal_Int32, O
 {
 };
 
-class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatchResultListener >
+class DispatchWatcher : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchResultListener >
 {
     public:
         enum RequestType
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index e81f57a475de..c329e7a4880e 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -31,7 +31,7 @@
 #include <osl/signal.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/conditn.hxx>
 #include <salhelper/thread.hxx>
 #include <boost/optional.hpp>
@@ -127,7 +127,7 @@ class OfficeIPCThread : public salhelper::Thread
 };
 
 
-class OfficeIPCThreadController : public ::cppu::WeakImplHelper2<
+class OfficeIPCThreadController : public ::cppu::WeakImplHelper<
                                             ::com::sun::star::lang::XServiceInfo,
                                             ::com::sun::star::frame::XTerminateListener >
 {
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 4cbac323b263..6cc894c4c548 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -22,7 +22,7 @@
 #include <rtl/strbuf.hxx>
 #include <osl/time.h>
 #include <osl/thread.h>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/unwrapargs.hxx>
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 
 namespace dp_log {
 
-typedef ::cppu::WeakComponentImplHelper1<ucb::XProgressHandler> t_log_helper;
+typedef ::cppu::WeakComponentImplHelper<ucb::XProgressHandler> t_log_helper;
 
 
 class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
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;
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index bfe26d8b20b5..16de82563dc0 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -21,7 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H
 
 #include <rtl/ref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/task/XAbortChannel.hpp>
@@ -104,7 +104,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool interactContinuation(
 
 
 class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel :
-    public ::cppu::WeakImplHelper1<css::task::XAbortChannel>
+    public ::cppu::WeakImplHelper<css::task::XAbortChannel>
 {
     bool m_aborted;
     css::uno::Reference<css::task::XAbortChannel> m_xNext;
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 0f84ee89076e..a062ea69efe6 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "dp_commandenvironments.hxx"
+#include <osl/diagnose.h>
 
 namespace deployment = com::sun::star::deployment;
 namespace task = com::sun::star::task;
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index b45c28ddd10b..b8e95cce08df 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/uno/Type.hxx>
 
@@ -31,7 +31,7 @@ namespace dp_manager {
    stored in the "tmp" repository. It prevents all kind of user interaction.
  */
 class BaseCommandEnv
-    : public ::cppu::WeakImplHelper3< css::ucb::XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< css::ucb::XCommandEnvironment,
                                       css::task::XInteractionHandler,
                                       css::ucb::XProgressHandler >
 {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index cfaf2bc5ceff..e662c31165b7 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <comphelper/servicedecl.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -164,7 +164,7 @@ namespace dp_manager {
 
 //ToDo: bundled extension
 ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) :
-    ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >(getMutex()),
+    ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager >(getMutex()),
     m_xContext( xContext )
 {
     m_xPackageManagerFactory = css::deployment::thePackageManagerFactory::get(m_xContext);
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 864d04bc0de9..d4e939c887e0 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -25,7 +25,7 @@
 #include "dp_interact.h"
 #include "dp_activepackages.hxx"
 #include <rtl/ref.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/deployment/XPackageRegistry.hpp>
 #include <com/sun/star/deployment/XPackageManager.hpp>
@@ -41,7 +41,7 @@ typedef std::unordered_map<
     OUStringHash > id2extensions;
 
 class ExtensionManager : private ::dp_misc::MutexHolder,
-        public ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >
+        public ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager >
 {
 public:
     explicit ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext);
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index e90ab8d55a70..ee3c0902f923 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -25,8 +25,8 @@
 #include "dp_interact.h"
 #include "dp_activepackages.hxx"
 #include <rtl/ref.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/deployment/XPackageRegistry.hpp>
 #include <com/sun/star/deployment/XPackageManager.hpp>
@@ -35,7 +35,7 @@
 
 namespace dp_manager {
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
     css::deployment::XPackageManager > t_pm_helper;
 
 
@@ -88,7 +88,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
 
     class CmdEnvWrapperImpl
-        : public ::cppu::WeakImplHelper2< css::ucb::XCommandEnvironment,
+        : public ::cppu::WeakImplHelper< css::ucb::XCommandEnvironment,
                                           css::ucb::XProgressHandler >
     {
         css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile;
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 06a5acd4227b..12522068a066 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -20,7 +20,7 @@
 
 #include "dp_manager.h"
 #include "dp_resource.h"
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <com/sun/star/deployment/thePackageManagerFactory.hpp>
 #include <unordered_map>
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno;
 namespace dp_manager {
 namespace factory {
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
     deployment::XPackageManagerFactory > t_pmfac_helper;
 
 
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index e6a775ed90ff..68f2d4a05b27 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -46,8 +46,7 @@
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustring.h>
@@ -60,7 +59,7 @@ namespace {
 using css::uno::Reference;
 
 class EmptyNodeList:
-    public cppu::WeakImplHelper1<css::xml::dom::XNodeList>,
+    public cppu::WeakImplHelper<css::xml::dom::XNodeList>,
     private boost::noncopyable
 {
 public:
@@ -139,7 +138,7 @@ class NoDescriptionException
 };
 
 class FileDoesNotExistFilter
-    : public ::cppu::WeakImplHelper2< css::ucb::XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< css::ucb::XCommandEnvironment,
                                       css::task::XInteractionHandler >
 
 {
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 0921d69df862..8407c50b4a39 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -20,7 +20,7 @@
 
 #include "dp_interact.h"
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <osl/diagnose.h>
 
@@ -90,7 +90,7 @@ void InteractionContinuationImpl::select() throw (RuntimeException, std::excepti
 
 
 class InteractionRequest :
-    public ::cppu::WeakImplHelper1<task::XInteractionRequest>
+    public ::cppu::WeakImplHelper<task::XInteractionRequest>
 {
     Any m_request;
     Sequence< Reference<task::XInteractionContinuation> > m_conts;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index b603682865a7..f66ed59268a0 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -29,7 +29,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/sequence.hxx>
 #include <ucbhelper/content.hxx>
@@ -56,7 +56,7 @@ namespace dp_registry {
 
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
     deployment::XPackageRegistry, util::XUpdatable > t_helper;
 
 
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index a8364a1bfe48..ecf2eb0d54d2 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -25,9 +25,8 @@
 #include "dp_interact.h"
 #include <rtl/ref.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <tools/inetmime.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/deployment/XPackageRegistry.hpp>
@@ -46,7 +45,7 @@ class PackageRegistryBackend;
 
 #define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend"
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
     css::deployment::XPackage > t_PackageBase;
 
 
@@ -104,7 +103,7 @@ protected:
 public:
 
     class TypeInfo :
-        public ::cppu::WeakImplHelper1<css::deployment::XPackageTypeInfo>
+        public ::cppu::WeakImplHelper<css::deployment::XPackageTypeInfo>
     {
         const OUString m_mediaType;
         const OUString m_fileFilter;
@@ -262,7 +261,7 @@ public:
 
 };
 
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
     css::lang::XEventListener,
     css::deployment::XPackageRegistry > t_BackendBase;
 
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 2ce790d1e50d..0d0ccfc96955 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -30,7 +30,7 @@
 #include <rtl/uri.hxx>
 #include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/content.hxx>
 #include <svl/inettype.hxx>
@@ -80,7 +80,7 @@ namespace backend {
 namespace bundle {
 namespace {
 
-typedef cppu::ImplInheritanceHelper1<PackageRegistryBackend,
+typedef cppu::ImplInheritanceHelper<PackageRegistryBackend,
                                      lang::XServiceInfo> ImplBaseT;
 
 
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index c2f66d8548eb..635865677115 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -25,7 +25,7 @@
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <svl/inettype.hxx>
 #include <com/sun/star/util/XUpdatable.hpp>
@@ -45,7 +45,7 @@ namespace backend {
 namespace script {
 namespace {
 
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
     ::dp_registry::backend::PackageRegistryBackend, util::XUpdatable > t_helper;
 
 class BackendImpl : public t_helper
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 95d9651346da..5c6c034fb7c1 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
@@ -37,7 +37,7 @@ namespace backend
 namespace sfwk
 {
 
-typedef ::cppu::WeakImplHelper1< css::xml::sax::XDocumentHandler > t_DocHandlerImpl;
+typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > t_DocHandlerImpl;
 
 class ParcelDescDocHandler : public t_DocHandlerImpl
 {
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index e71171f5f8dc..adec67a75215 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
 
@@ -48,7 +48,7 @@ namespace migration
     // class BasicMigration
 
 
-    typedef ::cppu::WeakImplHelper3<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::task::XJob > BasicMigration_BASE;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 8b56c7a1858b..adee3c883ff8 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -78,7 +78,7 @@ CJavaInfo::~CJavaInfo()
 
 
 
-class JavaMigration : public ::cppu::WeakImplHelper4<
+class JavaMigration : public ::cppu::WeakImplHelper<
     css::lang::XServiceInfo,
     css::lang::XInitialization,
     css::task::XJob,
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index ad04d8318ddd..2d2adc19efda 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -31,8 +31,7 @@
 
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/content.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -57,7 +56,7 @@ namespace migration
     // class ExtensionMigration
 
 
-    typedef ::cppu::WeakImplHelper3<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::task::XJob > ExtensionMigration_BASE;
@@ -111,7 +110,7 @@ namespace migration
     };
 
     class TmpRepositoryCommandEnv
-        : public ::cppu::WeakImplHelper3< ::com::sun::star::ucb::XCommandEnvironment,
+        : public ::cppu::WeakImplHelper< ::com::sun::star::ucb::XCommandEnvironment,
                                           ::com::sun::star::task::XInteractionHandler,
                                           ::com::sun::star::ucb::XProgressHandler >
     {
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 503f9c338859..435221408faf 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
 
@@ -48,7 +48,7 @@ namespace migration
     // class WordbookMigration
 
 
-    typedef ::cppu::WeakImplHelper3<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::task::XJob > WordbookMigration_BASE;
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 2881bf9df05f..e91ef02c55fe 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -32,8 +32,7 @@
 #include <com/sun/star/bridge/XInstanceProvider.hpp>
 #include <com/sun/star/bridge/XBridgeFactory2.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -49,7 +48,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 namespace desktop {
 
 class  Acceptor
-    : public ::cppu::WeakImplHelper2<css::lang::XServiceInfo, css::lang::XInitialization>
+    : public ::cppu::WeakImplHelper<css::lang::XServiceInfo, css::lang::XInitialization>
 {
 private:
     osl::Mutex m_aMutex;
@@ -93,7 +92,7 @@ public:
     static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
 };
 
-class AccInstanceProvider : public ::cppu::WeakImplHelper1<css::bridge::XInstanceProvider>
+class AccInstanceProvider : public ::cppu::WeakImplHelper<css::bridge::XInstanceProvider>
 {
 private:
     css::uno::Reference<css::uno::XComponentContext> m_rContext;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index cb37894d7a07..03d966761f1f 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -31,7 +31,7 @@
 #include <osl/process.h>
 #include <osl/conditn.hxx>
 #include <osl/file.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/sequence.hxx>
@@ -122,7 +122,7 @@ const OptionInfo s_option_infos [] = {
 };
 
 class DialogClosedListenerImpl :
-    public ::cppu::WeakImplHelper1< ui::dialogs::XDialogClosedListener >
+    public ::cppu::WeakImplHelper< ui::dialogs::XDialogClosedListener >
 {
     osl::Condition & m_rDialogClosedCondition;
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index c75e8fc46eb4..145117f7dd6a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -23,7 +23,7 @@
 #include "unopkg_shared.h"
 #include <osl/thread.h>
 #include <tools/resmgr.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/anytostring.hxx>
 #include <unotools/configmgr.hxx>
@@ -52,7 +52,7 @@ namespace {
 
 
 class CommandEnvironmentImpl
-    : public ::cppu::WeakImplHelper3< XCommandEnvironment,
+    : public ::cppu::WeakImplHelper< XCommandEnvironment,
                                       task::XInteractionHandler,
                                       XProgressHandler >
 {
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 8de8c298ce56..3d004f410b3f 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
@@ -64,7 +64,7 @@ public:
 };
 
 class  SplashScreen
-    : public ::cppu::WeakImplHelper3< XStatusIndicator, XInitialization, XServiceInfo >
+    : public ::cppu::WeakImplHelper< XStatusIndicator, XInitialization, XServiceInfo >
 {
     friend class SplashScreenWindow;
 private:
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index e7123344efe4..e0f7a189c4cd 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <osl/mutex.hxx>
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno;
 
 namespace desktop {
 
-class  UnxSplashScreen : public ::cppu::WeakImplHelper3< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
+class  UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
 {
 private:
     UnxSplashScreen( const UnxSplashScreen& ) SAL_DELETED_FUNCTION;
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 06da72a3b274..db9c4dd10bf8 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -59,7 +59,7 @@
 namespace {
 
 class Provider:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
     private boost::noncopyable
 {
@@ -150,7 +150,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::frame::XDispatch >,
     private boost::noncopyable
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 70b11ccebc03..6cbff6982c15 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
@@ -56,7 +56,7 @@
 namespace {
 
 class Provider:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
     private boost::noncopyable
 {
@@ -147,7 +147,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::frame::XDispatch >,
     private boost::noncopyable
 {