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

with the variadic variants.

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

33 files changed, 72 insertions, 73 deletions

diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
index d1534f0014b1..f1d0b368cf52 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTSIDEBAR_MODIFYLISTENER_HXX
 
 #include <com/sun/star/util/XModifyListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace chart {
 namespace sidebar {
@@ -26,7 +26,7 @@ public:
     virtual void modelInvalid() = 0;
 };
 
-class ChartSidebarModifyListener : public cppu::WeakImplHelper1<css::util::XModifyListener>
+class ChartSidebarModifyListener : public cppu::WeakImplHelper<css::util::XModifyListener>
 {
 public:
 
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
index c4c78cec6af0..e9d61fcacace 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTSIDEBARSELECTIONLISTENER_HXX
 
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "ObjectIdentifier.hxx"
 
@@ -30,7 +30,7 @@ public:
     virtual void SelectionInvalid() = 0;
 };
 
-class ChartSidebarSelectionListener : public cppu::WeakImplHelper1<css::view::XSelectionChangeListener>
+class ChartSidebarSelectionListener : public cppu::WeakImplHelper<css::view::XSelectionChangeListener>
 {
 public:
 
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index af775cc5bdf0..2ea920ba94bf 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/document/XDocumentEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <memory>
 
@@ -36,7 +36,7 @@ namespace dbaccess
 
     struct DocumentEventExecutor_Data;
     // DocumentEventExecutor
-    typedef ::cppu::WeakImplHelper1 <   css::document::XDocumentEventListener
+    typedef ::cppu::WeakImplHelper <   css::document::XDocumentEventListener
                                     >   DocumentEventExecutor_Base;
     class DocumentEventExecutor : public DocumentEventExecutor_Base
     {
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 06da72a3b274..ee36e84aa61e 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -46,7 +46,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>
@@ -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
 {
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 23cb0e5ec61a..4b7bb7aba12a 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -24,7 +24,7 @@
 
 #include "com/sun/star/beans/NamedValue.hpp"
 #include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "cppuhelper/compbase1.hxx"
+#include <cppuhelper/compbase.hxx>
 #include "cppuhelper/component_context.hxx"
 #include "jvmaccess/virtualmachine.hxx"
 #include "jvmaccess/unovirtualmachine.hxx"
@@ -36,7 +36,7 @@ struct MutexHolder
 {
     ::osl::Mutex m_mutex;
 };
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
     css::lang::XSingleComponentFactory > t_impl;
 
 class SingletonFactory : public MutexHolder, public t_impl
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 43c22d855ca0..428e70cc3ec4 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -26,13 +26,13 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustrbuf.hxx>
 
 /* This component will be instantiated for both import or export. Whether it calls
  * setSourceDocument or setTargetDocument determines which Impl function the filter
  * member calls */
-class LotusWordProImportFilter : public cppu::WeakImplHelper5
+class LotusWordProImportFilter : public cppu::WeakImplHelper
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 727e4884e08d..d634ea89af78 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -61,7 +61,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <osl/module.hxx>
@@ -346,7 +346,7 @@ public:
 };
 
 
-class Adapter : public cppu::WeakImplHelper2<
+class Adapter : public cppu::WeakImplHelper<
     com::sun::star::script::XInvocation, com::sun::star::lang::XUnoTunnel >
 {
     PyRef mWrappedObject;
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index a656ed19efe9..72c9083de099 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/connection/XConnector.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/unourl.hxx"
@@ -59,7 +59,7 @@ OUString resolver_getImplementationName()
     return OUString(IMPLNAME);
 }
 
-class ResolverImpl : public WeakImplHelper2< XServiceInfo, XUnoUrlResolver >
+class ResolverImpl : public WeakImplHelper< XServiceInfo, XUnoUrlResolver >
 {
     Reference< XMultiComponentFactory > _xSMgr;
     Reference< XComponentContext > _xCtx;
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index f8b4593c2f4c..fa2145c16683 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/NoConvergenceException.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "analysisdefs.hxx"
 #include "analysishelper.hxx"
@@ -44,7 +44,7 @@ class ResMgr;
 css::uno::Reference< css::uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
 
 
-class AnalysisAddIn : public cppu::WeakImplHelper5<
+class AnalysisAddIn : public cppu::WeakImplHelper<
                             css::sheet::XAddIn,
                             css::sheet::XCompatibilityNames,
                             css::sheet::addin::XAnalysis,
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index a8abffaacecc..ed3467337c77 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XDateFunctions.hpp>
 #include <com/sun/star/sheet/addin/XMiscFunctions.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <tools/resary.hxx>
@@ -175,7 +175,7 @@ struct FindScaFuncData
 
 // THE AddIn class for date functions
 
-class ScaDateAddIn : public ::cppu::WeakImplHelper6<
+class ScaDateAddIn : public ::cppu::WeakImplHelper<
                                 ::com::sun::star::sheet::XAddIn,
                                 ::com::sun::star::sheet::XCompatibilityNames,
                                 ::com::sun::star::sheet::addin::XDateFunctions,
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index d66f918b1d0f..7d5a75e89f7b 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/sheet/XAddIn.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XPricingFunctions.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <tools/resary.hxx>
@@ -191,7 +191,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL PricingFunctionAddIn_Create
 
 // AddIn class for pricing functions
 
-class ScaPricingAddIn : public ::cppu::WeakImplHelper5<
+class ScaPricingAddIn : public ::cppu::WeakImplHelper<
                                 css::sheet::XAddIn,
                                 css::sheet::XCompatibilityNames,
                                 css::sheet::addin::XPricingFunctions,
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 7d3c1b122b7c..c311752d7138 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -54,7 +54,7 @@ struct ScSolverCellEqual
 
 typedef std::unordered_map< css::table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
 
-typedef cppu::WeakImplHelper3<
+typedef cppu::WeakImplHelper<
                 com::sun::star::sheet::XSolver,
                 com::sun::star::sheet::XSolverDescription,
                 com::sun::star::lang::XServiceInfo >
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 6354c2a4ce49..8570bc31c360 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -39,7 +39,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/util/URL.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
@@ -62,7 +62,7 @@ struct Result: private boost::noncopyable {
 };
 
 class Listener:
-    public cppu::WeakImplHelper1< css::frame::XDispatchResultListener >
+    public cppu::WeakImplHelper< css::frame::XDispatchResultListener >
 {
 public:
     explicit Listener(Result * result): result_(result) { OSL_ASSERT(result != 0); }
@@ -87,7 +87,7 @@ void Listener::dispatchFinished(css::frame::DispatchResultEvent const & Result)
     result_->condition.set();
 }
 
-class Callback: public cppu::WeakImplHelper1< css::awt::XCallback > {
+class Callback: public cppu::WeakImplHelper< css::awt::XCallback > {
 public:
     Callback(
         css::uno::Reference< css::frame::XNotifyingDispatch > const & dispatch,
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d6321fd797bb..7e1cfb4a8e78 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -55,7 +55,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 
 #include "sot/stg.hxx"
@@ -81,7 +81,7 @@ static int nOpenFiles=0;
 static int nOpenStreams=0;
 #endif
 
-typedef ::cppu::WeakImplHelper2 < XInputStream, XSeekable > FileInputStreamWrapper_Base;
+typedef ::cppu::WeakImplHelper < XInputStream, XSeekable > FileInputStreamWrapper_Base;
 class FileStreamWrapper_Impl : public FileInputStreamWrapper_Base
 {
 protected:
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 818de7548739..03593c7d93ec 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -30,7 +30,7 @@
 
 
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <osl/mutex.hxx>
@@ -38,7 +38,7 @@
 #include <sot/stg.hxx>
 
 
-class OLESimpleStorage  : public ::cppu::WeakImplHelper3
+class OLESimpleStorage  : public ::cppu::WeakImplHelper
     < ::com::sun::star::embed::XOLESimpleStorage
                 , ::com::sun::star::lang::XInitialization
                 , ::com::sun::star::lang::XServiceInfo >
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
index 86566894ed5b..bbd71d33dc38 100644
--- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <svgio/svgreader/svgdocument.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace svgio { namespace svgreader { class SvgCharacterNode; }}
 
@@ -29,7 +30,7 @@ namespace svgio
 {
     namespace svgreader
     {
-        class SvgDocHdl : public cppu::WeakImplHelper1< com::sun::star::xml::sax::XDocumentHandler >
+        class SvgDocHdl : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler >
         {
         private:
             // the complete SVG Document
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 1f38a8cbc8d0..8edaa5a1cd6a 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -27,7 +27,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <cppuhelper/weak.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/ucb/CheckinArgument.hpp>
 #include <com/sun/star/ucb/ContentCreationError.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -76,7 +76,7 @@ using namespace com::sun::star::uno;
 namespace ucbhelper
 {
 
-class EmptyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
+class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream >
 {
 public:
     virtual sal_Int32 SAL_CALL readBytes(
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 4b6bda7c068d..ed73a86fd85b 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "ucbhelper/proxydecider.hxx"
 
 using namespace com::sun::star;
@@ -116,7 +116,7 @@ public:
 
 
 class InternetProxyDecider_Impl :
-    public cppu::WeakImplHelper1< util::XChangesListener >
+    public cppu::WeakImplHelper< util::XChangesListener >
 {
     mutable osl::Mutex                       m_aMutex;
     InternetProxyServer                      m_aHttpProxy;
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ab38ef99b6c7..6efcf64beda1 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -55,7 +55,7 @@
 #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
 #include "com/sun/star/util/theMacroExpander.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/unourl.hxx"
@@ -77,7 +77,7 @@
 
 namespace {
 
-class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
+class Service: public ::cppu::WeakImplHelper< css::lang::XMain > {
 public:
     explicit Service(
         css::uno::Reference< css::uno::XComponentContext > const & context):
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 69b33c3b9f6a..09a02ffc1c8f 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -27,7 +27,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -40,7 +40,7 @@
 
 namespace {
 
-class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > {
+class Service: public ::cppu::WeakImplHelper< ::test::types::XServer > {
 public:
     Service() {}
 
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index d1f112dabd82..db8dd3b9dcf8 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -25,7 +25,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -38,7 +38,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper1< test::types::XTest > {
+class Service: public cppu::WeakImplHelper< test::types::XTest > {
 public:
     Service() {}
 
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 13f81bb2ae38..d91e97dfae54 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -22,7 +22,7 @@
 #include "ids.hrc"
 
 #include <com/sun/star/util/XStringWidth.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/urlobj.hxx>
 
 #include <vcl/button.hxx>
@@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
     @seealso    method InetURLObject::getAbbreviated()
     @threadsafe no
 *//*-*************************************************************************************************************/
-class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
+class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth >
 {
     public:
         explicit StringCalculator( const OutputDevice* pDevice )
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index f3984d11d877..389670da2c71 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -27,7 +27,7 @@
 
 #include "iahndl.hxx"
 #include <comphelper/namedvaluecollection.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace com::sun::star;
@@ -35,7 +35,7 @@ using namespace com::sun::star;
 namespace {
 
 class UUIInteractionHandler:
-    public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
+    public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
                                   com::sun::star::lang::XInitialization,
                                   com::sun::star::task::XInteractionHandler2 >,
     private boost::noncopyable
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index f48e5b223f87..aac2ee3f4a86 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
 #define INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -137,7 +137,7 @@ private:
 
 
 class PasswordContainerInteractionHandler :
-        public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo,
+        public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
                                       com::sun::star::task::XInteractionHandler2 >
 {
 public:
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 964883b62b9b..d355c4bbaee1 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -24,12 +24,12 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/XInteractionRequestStringResolver.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class UUIInteractionHelper;
 
 class UUIInteractionRequestStringResolver:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         com::sun::star::lang::XServiceInfo,
         com::sun::star::task::XInteractionRequestStringResolver >
 {
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index c656e3659533..f3f85131dd2f 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/mutex.hxx>
 
@@ -35,7 +35,7 @@ class AccObjectManagerAgent;
  * methods.
  */
 class AccEventListener
-    : public ::cppu::WeakImplHelper1<
+    : public ::cppu::WeakImplHelper<
         com::sun::star::accessibility::XAccessibleEventListener>
 {
 protected:
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index ecfd819e540a..1a52becf0e60 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include  "AccObjectManagerAgent.hxx"
 
@@ -36,7 +36,7 @@
  * cached into bridge managers, and they are monitored by listeners for later accessible event handling.
  */
 class AccTopWindowListener
-    : public ::cppu::WeakImplHelper1<com::sun::star::awt::XTopWindowListener>
+    : public ::cppu::WeakImplHelper<com::sun::star::awt::XTopWindowListener>
 {
 private:
     AccObjectManagerAgent accManagerAgent;
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 36de815927c4..6493452128aa 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <rtl/ref.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -57,7 +57,7 @@ static OUString getImplementationName_MSAAServiceImpl()
     return OUString( "com.sun.star.accessibility.my_sc_implementation.MSAAService" );
 }
 
-class MSAAServiceImpl : public ::cppu::WeakImplHelper2<
+class MSAAServiceImpl : public ::cppu::WeakImplHelper<
             XMSAAService, lang::XServiceInfo >
 {
 private:
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index 595936df949b..6a5bde65c0af 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -28,8 +28,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unotools/mediadescriptor.hxx>
 
@@ -47,7 +46,7 @@ namespace detail
 {
 
 template<class Generator>
-class ImportFilterImpl : public cppu::WeakImplHelper4
+class ImportFilterImpl : public cppu::WeakImplHelper
     <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
@@ -192,10 +191,10 @@ private:
 /** A base class for import filters.
  */
 template<class Generator>
-struct ImportFilter : public cppu::ImplInheritanceHelper1<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>
+struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>
 {
     ImportFilter(const css::uno::Reference<css::uno::XComponentContext> &rxContext)
-        : cppu::ImplInheritanceHelper1<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>(rxContext)
+        : cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>(rxContext)
     {
     }
 };
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index ed96f4e2ae94..d048fe796222 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -20,13 +20,12 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 /* This component will be instantiated for both import or export. Whether it calls
  * setSourceDocument or setTargetDocument determines which Impl function the filter
  * member calls */
-class WordPerfectImportFilter : public cppu::WeakImplHelper5
+class WordPerfectImportFilter : public cppu::WeakImplHelper
     <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
@@ -91,7 +90,7 @@ SAL_CALL WordPerfectImportFilter_createInstance(const ::com::sun::star::uno::Ref
 throw (::com::sun::star::uno::Exception);
 
 
-class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 <
+class WordPerfectImportFilterDialog : public cppu::WeakImplHelper <
     com::sun::star::ui::dialogs::XExecutableDialog,
     com::sun::star::lang::XServiceInfo,
     com::sun::star::beans::XPropertyAccess
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 9e2a8ec1b0e7..35bf4e65f0d8 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -28,12 +28,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace treeview {
 
-class TVFactory: public cppu::WeakImplHelper2 <
+class TVFactory: public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::lang::XMultiServiceFactory >
     {
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 757571064b0f..7bd8ea7fd800 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace treeview {
 
@@ -61,7 +61,7 @@ namespace treeview {
     class TVDom;
     class TVChildTarget;
 
-    class TVBase : public cppu::WeakImplHelper4 <
+    class TVBase : public cppu::WeakImplHelper <
         css::container::XNameAccess,
         css::container::XHierarchicalNameAccess,
         css::util::XChangesNotifier,