tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, for comphelper.
This also includes extra changes in other modules
required accordingly.

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

43 files changed, 109 insertions, 116 deletions

diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index d0de0e32d18a..35bdc06a823f 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -177,10 +177,7 @@
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index 8971a4312dfd..478c0fb9f6a3 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/i18n/CharType.hpp>
 
 #include "cppunit/TestAssert.h"
@@ -88,7 +88,7 @@ void TestString::testIsdigitAsciiString()
 
 using namespace ::com::sun::star;
 
-class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
+class testCollator : public cppu::WeakImplHelper< i18n::XCollator >
 {
 public:
     virtual sal_Int32 SAL_CALL compareSubstring(
@@ -123,7 +123,7 @@ public:
 
 #define IS_DIGIT(CHAR) (((CHAR) >= 48) && ((CHAR <= 57)))
 
-class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
+class testBreakIterator : public cppu::WeakImplHelper< i18n::XBreakIterator >
 {
 public:
     virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32,
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index b3d58700be3f..7596207379e6 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -25,8 +25,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -39,7 +38,7 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
 
-class AnyCompare : public ::cppu::WeakImplHelper1< XAnyCompare >
+class AnyCompare : public ::cppu::WeakImplHelper< XAnyCompare >
 {
     Reference< XCollator > m_xCollator;
 
@@ -54,7 +53,7 @@ public:
     virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XInitialization, XServiceInfo >
+class AnyCompareFactory : public cppu::WeakImplHelper< XAnyCompareFactory, XInitialization, XServiceInfo >
 {
     Reference< XAnyCompare >            m_xAnyCompare;
     Reference< XComponentContext >      m_xContext;
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index b8b91f3ee48f..b6c2776742a3 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -33,7 +33,7 @@ using namespace com::sun::star;
 
 typedef std::vector < uno::Sequence< beans::PropertyValue > > IndexedPropertyValues;
 
-class IndexedPropertyValuesContainer : public cppu::WeakImplHelper2< container::XIndexContainer, lang::XServiceInfo >
+class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::XIndexContainer, lang::XServiceInfo >
 {
 public:
     IndexedPropertyValuesContainer() throw();
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 88ff7f9bfc02..fd569eb46112 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <map>
@@ -34,7 +34,7 @@ using namespace com::sun::star;
 
 typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues;
 
-class NamedPropertyValuesContainer : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
+class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNameContainer, lang::XServiceInfo >
 {
 public:
     NamedPropertyValuesContainer() throw();
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 9338d711f807..06c05bebeda7 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -286,8 +286,8 @@ namespace comphelper
     };
 
 
-    typedef ::cppu::WeakImplHelper1 <   XEnumeration
-                                    >   MapEnumeration_Base;
+    typedef ::cppu::WeakImplHelper <   XEnumeration
+                                   >   MapEnumeration_Base;
     class MapEnumeration :public ComponentBase
                          ,public MapEnumeration_Base
     {
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index c296d5373c97..e282383b6676 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -22,7 +22,7 @@
 #include <map>
 
 #include <comphelper/namecontainer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 
@@ -37,7 +37,7 @@ namespace comphelper
     };
 
     /** this is the base helper class for NameContainer thats also declared in this header. */
-    class NameContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameContainer >, private NameContainerImpl
+    class NameContainer : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer >, private NameContainerImpl
     {
     public:
         explicit NameContainer( ::com::sun::star::uno::Type aType );
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 5074a577b185..19e534ce75fb 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -40,8 +40,7 @@
 #include <com/sun/star/script/XScriptListener.hpp>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <deque>
 #include <algorithm>
@@ -76,7 +75,7 @@ struct AttacherIndex_Impl
 
 
 class ImplEventAttacherManager
-    : public WeakImplHelper2< XEventAttacherManager, XPersistObject >
+    : public WeakImplHelper< XEventAttacherManager, XPersistObject >
 {
     friend class AttacherAllListener_Impl;
     ::std::deque< AttacherIndex_Impl >  aIndex;
@@ -143,7 +142,7 @@ private:
 
 // Implementation of an EventAttacher-subclass 'AllListeners', which
 // only passes individual events of the general AllListeners.
-class AttacherAllListener_Impl : public WeakImplHelper1< XAllListener >
+class AttacherAllListener_Impl : public WeakImplHelper< XAllListener >
 {
     ImplEventAttacherManager*           mpManager;
     Reference< XEventAttacherManager >  xManager;
diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index 5e739edf9205..ef2e058f8020 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx
@@ -20,7 +20,6 @@
 #include <comphelper/accessiblekeybindinghelper.hxx>
 
 
-
 namespace comphelper
 {
 
@@ -41,7 +40,7 @@ namespace comphelper
 
 
     OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper )
-        : cppu::WeakImplHelper1<XAccessibleKeyBinding>( rHelper )
+        : cppu::WeakImplHelper<XAccessibleKeyBinding>( rHelper )
         , m_aKeyBindings( rHelper.m_aKeyBindings )
     {
     }
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 26d56ca1f709..86e37e149312 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/task/PasswordRequest.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionPassword2.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Type;
@@ -45,7 +46,7 @@ namespace comphelper {
 
 
 
-class AbortContinuation : public ::cppu::WeakImplHelper1< XInteractionAbort >
+class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort >
 {
 public:
     virtual void SAL_CALL select() throw( RuntimeException, std::exception ) SAL_OVERRIDE {}
@@ -53,7 +54,7 @@ public:
 
 
 
-class PasswordContinuation : public ::cppu::WeakImplHelper1< XInteractionPassword2 >
+class PasswordContinuation : public ::cppu::WeakImplHelper< XInteractionPassword2 >
 {
 public:
     inline explicit     PasswordContinuation() : mbReadOnly( false ), mbSelected( false ) {}
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index 0b34bb4f5774..13af7b53635f 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -25,14 +25,14 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #define SIMPLELOGRING_SIZE 256
 
 namespace comphelper
 {
 
-class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging::XSimpleLogRing,
+class OSimpleLogRing : public ::cppu::WeakImplHelper< ::com::sun::star::logging::XSimpleLogRing,
                                                            ::com::sun::star::lang::XInitialization,
                                                            ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index 06908eff869a..abc9b348f249 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/embed/Actions.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 
@@ -39,7 +38,7 @@ class OLockListener;
 
 // the service is implemented as a wrapper to be able to die by refcount
 // the disposing mechanics is required for java related scenarios
-class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XComponent,
+class OInstanceLocker : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XComponent,
                                                         ::com::sun::star::lang::XInitialization,
                                                         ::com::sun::star::lang::XServiceInfo >
 {
@@ -83,7 +82,7 @@ public:
 };
 
 
-class OLockListener : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XCloseListener,
+class OLockListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener,
                                                     ::com::sun::star::frame::XTerminateListener >
 {
     ::osl::Mutex m_aMutex;
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index 349288571f55..0554d1c652d0 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -26,12 +26,12 @@
 #include <com/sun/star/awt/XCallback.hpp>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace comphelper
 {
 
-class OOfficeRestartManager : public ::cppu::WeakImplHelper3< ::com::sun::star::task::XRestartManager
+class OOfficeRestartManager : public ::cppu::WeakImplHelper< ::com::sun::star::task::XRestartManager
                                                             , ::com::sun::star::awt::XCallback
                                                             , ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index ca79f609aa93..7ed429e0d7cd 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -22,7 +22,7 @@
 #include <osl/diagnose.h>
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <vector>
@@ -33,7 +33,7 @@ namespace comphelper {
 namespace service_decl {
 
 class ServiceDecl::Factory :
-        public cppu::WeakImplHelper2<lang::XSingleComponentFactory,
+        public cppu::WeakImplHelper<lang::XSingleComponentFactory,
                                      lang::XServiceInfo>,
         private boost::noncopyable
 {
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 0d0ab574f976..8cc740747c33 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -31,7 +31,7 @@ namespace comphelper {
 
 
 
-typedef cppu::WeakImplHelper2<
+typedef cppu::WeakImplHelper<
             com::sun::star::util::XOfficeInstallationDirectories,
             com::sun::star::lang::XServiceInfo > UnoImplBase;
 
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 3efe2d1126f2..d4a4ebf8d502 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -26,14 +26,14 @@
 #include <com/sun/star/io/XSeekableInputStream.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 
 #include <string.h>
 #include <vector>
 
 using ::cppu::OWeakObject;
-using ::cppu::WeakImplHelper4;
+using ::cppu::WeakImplHelper;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -42,7 +42,7 @@ using namespace ::osl;
 namespace comphelper
 {
 
-class UNOMemoryStream : public WeakImplHelper4 < XStream, XSeekableInputStream, XOutputStream, XTruncate >
+class UNOMemoryStream : public WeakImplHelper< XStream, XSeekableInputStream, XOutputStream, XTruncate >
 {
 public:
     UNOMemoryStream();
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index 1ea60fa5a63f..233cc8dc6524 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -26,7 +26,7 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/seqstream.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
 namespace {
 
 class SequenceInputStreamService:
-    public ::cppu::WeakImplHelper3<
+    public ::cppu::WeakImplHelper<
         lang::XServiceInfo,
         io::XSeekableInputStream,
         lang::XInitialization>,
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index f1ef3c6ebb48..6d604dc9b03f 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.cxx
@@ -26,7 +26,7 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/seqstream.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
 namespace {
 
 class SequenceOutputStreamService:
-    public cppu::WeakImplHelper2<lang::XServiceInfo, io::XSequenceOutputStream>,
+    public cppu::WeakImplHelper<lang::XServiceInfo, io::XSequenceOutputStream>,
     private boost::noncopyable
 {
 public:
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index b550f091482d..bc2787a1782a 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/servicedecl.hxx>
 
 #include <com/sun/star/deployment/UpdateInformationProvider.hpp>
@@ -59,7 +59,7 @@ namespace xml = com::sun::star::xml ;
 namespace dp_info {
 
 class PackageInformationProvider :
-        public ::cppu::WeakImplHelper1< deployment::XPackageInformationProvider >
+        public ::cppu::WeakImplHelper< deployment::XPackageInformationProvider >
 
 {
     public:
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index 1df28f6d4c2d..0d269b4c72cf 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 /*
@@ -34,7 +34,7 @@
 namespace comphelper
 {
     class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo:
-        public ::cppu::WeakImplHelper1<
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::beans::XPropertySetInfo >
     {
     public:
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 60d2515aaa8f..060cb04f15d9 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -21,13 +21,13 @@
 #define INCLUDED_COMPHELPER_MASTERPROPERTYSETINFO_HXX
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
     class COMPHELPER_DLLPUBLIC MasterPropertySetInfo:
-        public ::cppu::WeakImplHelper1<
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::beans::XPropertySetInfo >
     {
     public:
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index c645ec88f98b..14bbcc76734b 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 
@@ -65,7 +65,7 @@ namespace comphelper
     //= OSelectionChangeMultiplexer
 
     /// multiplexer for selection changes
-    class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer  :public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener>
+    class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer  :public cppu::WeakImplHelper< ::com::sun::star::view::XSelectionChangeListener>
     {
         friend class OSelectionChangeListener;
          ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>  m_xSet;
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index 571fea104e50..565265b1e834 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -24,11 +24,11 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/ChainablePropertySet.hxx>
 #include <comphelper/solarmutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace comphelper
 {
-    typedef  cppu::WeakImplHelper3
+    typedef  cppu::WeakImplHelper
     <
         ::com::sun::star::beans::XPropertySet,
         ::com::sun::star::beans::XMultiPropertySet,
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 0a1105c884f6..572826bbf6a1 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 #include <vector>
@@ -37,8 +37,8 @@ namespace comphelper
     // OAccessibleKeyBindingHelper
 
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::accessibility::XAccessibleKeyBinding
-                                    >   OAccessibleKeyBindingHelper_Base;
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::accessibility::XAccessibleKeyBinding
+                                   >   OAccessibleKeyBindingHelper_Base;
 
     /** a helper class for implementing an accessible keybinding
      */
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 16513a0da1b1..61a315248691 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -29,10 +29,9 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
@@ -235,7 +234,7 @@ namespace comphelper
 
     //= OAccessibleContextWrapper
 
-    typedef ::cppu::WeakComponentImplHelper2<    ::com::sun::star::accessibility::XAccessibleEventBroadcaster
+    typedef ::cppu::WeakComponentImplHelper<    ::com::sun::star::accessibility::XAccessibleEventBroadcaster
                                             ,   ::com::sun::star::accessibility::XAccessibleContext
                                             >   OAccessibleContextWrapper_CBase;
 
@@ -318,8 +317,8 @@ namespace comphelper
                         >   AccessibleMap;
                         // TODO: think about if we should hold these objects weak
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::lang::XEventListener
-                                    >   OWrappedAccessibleChildrenManager_Base;
+    typedef ::cppu::WeakImplHelper<   ::com::sun::star::lang::XEventListener
+                                  >   OWrappedAccessibleChildrenManager_Base;
     /** manages wrapping XAccessible's to XAccessible's
     */
     class COMPHELPER_DLLPUBLIC OWrappedAccessibleChildrenManager : public OWrappedAccessibleChildrenManager_Base
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index e359b0b5dbb8..89622b44d710 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 
@@ -30,7 +30,7 @@ namespace comphelper
 
 struct AttributeList_Impl;
 
-class COMPHELPER_DLLPUBLIC AttributeList : public ::cppu::WeakImplHelper1
+class COMPHELPER_DLLPUBLIC AttributeList : public ::cppu::WeakImplHelper
 <
     ::com::sun::star::xml::sax::XAttributeList
 >
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 6b2525ad4fce..73498b002d23 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
 
 #include <com/sun/star/container/XContainer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/comphelperdllapi.h>
 
@@ -71,7 +71,7 @@ namespace comphelper
     //= OContainerListenerAdapter
 
     class COMPHELPER_DLLPUBLIC OContainerListenerAdapter
-            :public cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener >
+            :public cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener >
     {
         friend class OContainerListener;
 
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 952658d12940..b66afd721b08 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -23,7 +23,7 @@
 #include <comphelper/comphelperdllapi.h>
 #include <com/sun/star/task/PasswordRequestMode.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace comphelper {
 
@@ -42,7 +42,7 @@ enum DocPasswordRequestType
 
 
 class COMPHELPER_DLLPUBLIC SimplePasswordRequest :
-        public cppu::WeakImplHelper1<css::task::XInteractionRequest>
+        public cppu::WeakImplHelper<css::task::XInteractionRequest>
 {
 public:
     explicit    SimplePasswordRequest( com::sun::star::task::PasswordRequestMode eMode );
@@ -69,7 +69,7 @@ private:
     string for a document.
  */
 class COMPHELPER_DLLPUBLIC DocPasswordRequest :
-        public cppu::WeakImplHelper1<css::task::XInteractionRequest>
+        public cppu::WeakImplHelper<css::task::XInteractionRequest>
 {
 public:
     explicit            DocPasswordRequest(
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 6e0f9820cbdc..723a8db238fb 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -25,8 +25,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/comphelperdllapi.h>
 
@@ -43,8 +42,8 @@ struct OEnumerationLock
     on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
-                         , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
-                                                           css::lang::XEventListener    >
+                         , public ::cppu::WeakImplHelper< css::container::XEnumeration ,
+                                                          css::lang::XEventListener    >
 {
     css::uno::Sequence< OUString >                m_aNames;
     sal_Int32                                           m_nPos;
@@ -72,8 +71,8 @@ private:
     on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
-                          , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
-                                                            css::lang::XEventListener    >
+                          , public ::cppu::WeakImplHelper< css::container::XEnumeration ,
+                                                           css::lang::XEventListener    >
 {
     sal_Int32                                         m_nPos;
     css::uno::Reference< css::container::XIndexAccess > m_xAccess;
@@ -99,7 +98,7 @@ private:
 
 */
 class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
-                                           , public  ::cppu::WeakImplHelper1< css::container::XEnumeration >
+                                           , public  ::cppu::WeakImplHelper< css::container::XEnumeration >
 {
     sal_Int32                         m_nPos;
     css::uno::Sequence< css::uno::Any > m_lItems;
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index bc0720f5d289..35cf0ea4e389 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
 #define INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <osl/diagnose.h>
 #include <cppuhelper/weakref.hxx>
@@ -35,7 +35,7 @@ namespace comphelper
     // is helper class to avoid a cycle in refcount between the XEventListener
     // and the member XComponent
 
-    class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+    class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener >
     {
         ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XEventListener> m_xListener;
     public:
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 6520b484d06a..c8452139a59d 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_INTERACTION_HXX
 
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
@@ -63,7 +63,7 @@ namespace comphelper
     */
     template <class INTERACTION>
     class OInteraction
-            :public ::cppu::WeakImplHelper1< INTERACTION >
+            :public ::cppu::WeakImplHelper< INTERACTION >
             ,public OInteractionSelect
     {
     public:
@@ -126,8 +126,8 @@ namespace comphelper
 
     //= OInteractionRequest
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::task::XInteractionRequest
-                                    >   OInteractionRequest_Base;
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::task::XInteractionRequest
+                                   >   OInteractionRequest_Base;
     /** implements an interaction request (com.sun.star.task::XInteractionRequest)<p/>
         at run time, you can freely add any interaction continuation objects
     */
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 2e50d3b73707..ec4db52ff556 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -29,7 +29,7 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <boost/functional/hash.hpp>
 #include <unordered_map>
 #include <vector>
@@ -46,7 +46,7 @@ namespace comphelper{
     @threadsafe
  */
 class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
-                                              , public  ::cppu::WeakImplHelper1< css::frame::XUntitledNumbers >
+                                              , public  ::cppu::WeakImplHelper< css::frame::XUntitledNumbers >
 {
 
     // types, const
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index d7fa44a8c74d..4c7495328f51 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 
@@ -32,7 +32,7 @@ namespace comphelper
 {
 
 // this helper class is designed to allow to parse ContentType- and Relationship-related information from OfficeOpenXML format
-class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
+class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler >
 {
     sal_uInt16 m_nFormat; // which format to parse
 
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index 9753aeccd788..f618adceab47 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -22,7 +22,7 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/file.hxx>
 #include <comphelper/comphelperdllapi.h>
 
@@ -32,7 +32,7 @@ namespace comphelper
 // FmUnoIOStream,
 // Stream to read and write data, based on File
 
-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XInputStream>
+class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XInputStream>
 {
     ::osl::Mutex    m_aMutex;
     ::osl::File*    m_pFile;
@@ -53,7 +53,7 @@ public:
 // FmUnoOutStream,
 // data sink for the files
 
-class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XOutputStream>
+class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream>
 {
 public:
     COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 06bba8c87f53..e554282c9d52 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -25,7 +25,7 @@
 #include <map>
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
@@ -47,7 +47,7 @@ class PropertyMapImpl;
 /** this class implements a XPropertySetInfo that is initialized with arrays of PropertyMapEntry.
     It is used by the class PropertySetHelper.
 */
-class COMPHELPER_DLLPUBLIC PropertySetInfo : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >
+class COMPHELPER_DLLPUBLIC PropertySetInfo : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo >
 {
 private:
     PropertyMapImpl* mpMap;
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 7fa87320fcff..e54af6bc2ea2 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
 
 #include <comphelper/propstate.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 
@@ -70,7 +70,7 @@ namespace comphelper
     //= OPropertyChangeMultiplexer
 
     /// multiplexer for property changes
-    class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer   :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
+    class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer   :public cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener>
     {
         friend class OPropertyChangeListener;
          ::com::sun::star::uno::Sequence< OUString >     m_aProperties;
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index d1c69e5cb4ee..bec6ac73c470 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -24,13 +24,13 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
 
-class COMPHELPER_DLLPUBLIC OSeekableInputWrapper : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream,
+class COMPHELPER_DLLPUBLIC OSeekableInputWrapper : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream,
                                                                 ::com::sun::star::io::XSeekable >
 {
     ::osl::Mutex    m_aMutex;
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index aea8329f644f..a1982ab4fe2c 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -25,8 +25,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
@@ -39,7 +38,7 @@ namespace comphelper
 
 
 class COMPHELPER_DLLPUBLIC SequenceInputStream
-: public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable >
+: public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable >
 {
     ::osl::Mutex    m_aMutex;
     css::uno::Sequence<sal_Int8> m_aData;
@@ -74,7 +73,7 @@ public:
 private:
     inline sal_Int32 avail();
 };
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > OSequenceOutputStream_Base;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::io::XOutputStream > OSequenceOutputStream_Base;
 
 class COMPHELPER_DLLPUBLIC OSequenceOutputStream : public OSequenceOutputStream_Base
 {
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index a6ab8b666f92..02fbb2ff4e10 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_COMPHELPER_SERVICEDECL_HXX
 
 #include <comphelper/comphelperdllapi.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <uno/environment.h>
@@ -48,7 +48,7 @@ typedef ::boost::function3<
     The declaration can be done in various ways, the (simplest) form is
 
     <pre>
-    class MyClass : public cppu::WeakImplHelper2<XInterface1, XInterface2> {
+    class MyClass : public cppu::WeakImplHelper<XInterface1, XInterface2> {
     public:
         MyClass( uno::Reference<uno::XComponentContext> const& xContext )
         [...]
@@ -66,7 +66,7 @@ typedef ::boost::function3<
     context:
 
     <pre>
-    class MyClass : public cppu::WeakImplHelper2<XInterface1, XInterface2> {
+    class MyClass : public cppu::WeakImplHelper<XInterface1, XInterface2> {
     public:
         MyClass( uno::Sequence<uno::Any> const& args,
                  uno::Reference<uno:XComponentContext> const& xContext )
@@ -182,9 +182,9 @@ private:
 };
 
 template <typename ImplT>
-class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> >
+class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper<ImplT,css::lang::XServiceInfo> >
 {
-typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
+typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
 public:
     ServiceImpl(
         ServiceDecl const& rServiceDecl,
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 5e4407d347d5..89810982d317 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX
 #define INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
@@ -66,7 +66,7 @@ public:
         reset();
     }
 private:
-    class TerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener >
+    class TerminateListener : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XTerminateListener >
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent;
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index f3dc86c8b8c4..47efe383c027 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
 #define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <cppuhelper/weakref.hxx>
@@ -97,7 +97,7 @@ namespace comphelper
         as this can't be done in a generic way</p>
     */
     class OWeakListenerAdapter
-            :public ::cppu::WeakComponentImplHelper1 < LISTENER >
+            :public ::cppu::WeakComponentImplHelper< LISTENER >
             ,public OWeakListenerAdapterBase
     {
     protected:
@@ -158,7 +158,7 @@ namespace comphelper
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener,
         const ::com::sun::star::uno::Reference< BROADCASTER >& _rxBroadcaster
     )
-        : ::cppu::WeakComponentImplHelper1< LISTENER >( m_aMutex )
+        : ::cppu::WeakComponentImplHelper< LISTENER >( m_aMutex )
         , OWeakListenerAdapterBase( _rxListener, _rxBroadcaster )
     {
     }
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 876cf3423e0d..4c3e83b45919 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -59,6 +59,7 @@
 #include <tools/config.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -1707,7 +1708,7 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > >
 }
 
 
-class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest >
+class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper< task::XInteractionRequest >
 {
     uno::Any m_aRequest;
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > m_lContinuations;
@@ -1777,7 +1778,7 @@ com::sun::star::uno::Reference < task::XInteractionRequest > RequestPackageRepar
 }
 
 
-class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest >
+class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper< task::XInteractionRequest >
 {
     uno::Any m_aRequest;
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > m_lContinuations;
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index 1572cc7f5054..1200eef67b64 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <comphelper/interaction.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions >
 {
@@ -32,7 +33,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class RequestFilterOptions : public ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionRequest >
 {
     ::com::sun::star::uno::Any m_aRequest;