9 files changed, 23 insertions, 22 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index d87b04f1eb10..cce60b74a8d6 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -28,6 +28,7 @@
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index dccf44464b47..4f05285a6027 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -26,6 +26,7 @@
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index a96550f18bed..7f67eb8b2235 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <memory>
 
@@ -45,7 +45,7 @@ namespace utl
         <code>AccessibleRelationSet</code> service.
 */
 class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper
-    :   public cppu::WeakImplHelper1< css::accessibility::XAccessibleRelationSet >
+    :   public cppu::WeakImplHelper< css::accessibility::XAccessibleRelationSet >
 {
 public:
     //=====  internal  ========================================================
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index b59429577f41..7916b74490d6 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <memory>
 
@@ -44,7 +44,7 @@ namespace utl
         <code>AccessibleStateSet</code> service.
 */
 class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper
-    :   public cppu::WeakImplHelper1< css::accessibility::XAccessibleStateSet >
+    :   public cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet >
 {
 public:
     //=====  internal  ========================================================
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 03ccdd4181d2..a7fa9fd854cb 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <unordered_map>
 #include <vector>
 
@@ -63,7 +63,7 @@ enum class GlobalEventId
 class GlobalEventConfig_Impl;
 
 class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
-        public ::cppu::WeakImplHelper2 < css::document::XEventsSupplier, css::container::XNameReplace >
+        public cppu::WeakImplHelper< css::document::XEventsSupplier, css::container::XNameReplace >
 {
     public:
         GlobalEventConfig( );
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index c4c586fbb55e..a98a682f8580 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/stream.hxx>
 
 namespace utl
@@ -36,7 +36,7 @@ namespace utl
  * @author  Dirk Grobler
  * @since   00/28/03
  */
-    typedef ::cppu::WeakImplHelper2<css::io::XInputStream, css::io::XSeekable> InputStreamHelper_Base;
+    typedef cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> InputStreamHelper_Base;
     // needed for some compilers
 class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base
 {
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index f0b52aa060a0..037aeee7b0f5 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 class SvStream;
@@ -37,11 +37,9 @@ namespace utl
 
 //= OInputStreamWrapper
 
-typedef ::cppu::WeakImplHelper1 <   css::io::XInputStream
-                                > InputStreamWrapper_Base;
-// needed for some compilers
 /// helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
-class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base
+class UNOTOOLS_DLLPUBLIC OInputStreamWrapper
+        : public cppu::WeakImplHelper<css::io::XInputStream>
 {
 protected:
     ::osl::Mutex    m_aMutex;
@@ -73,12 +71,11 @@ protected:
 
 //= OSeekableInputStreamWrapper
 
-typedef ::cppu::ImplHelper1 <   css::io::XSeekable
-                            >   OSeekableInputStreamWrapper_Base;
 /** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
     which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
 */
-class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public ::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, css::io::XSeekable >
+class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper
+        : public cppu::ImplInheritanceHelper< OInputStreamWrapper, css::io::XSeekable >
 {
 protected:
     OSeekableInputStreamWrapper() {}
@@ -96,9 +93,7 @@ public:
 
 //= OOutputStreamWrapper
 
-typedef ::cppu::WeakImplHelper1<css::io::XOutputStream> OutputStreamWrapper_Base;
-    // needed for some compilers
-class OOutputStreamWrapper : public OutputStreamWrapper_Base
+class OOutputStreamWrapper : public cppu::WeakImplHelper<css::io::XOutputStream>
 {
 public:
     UNOTOOLS_DLLPUBLIC OOutputStreamWrapper(SvStream& _rStream);
@@ -146,7 +141,11 @@ private:
     virtual sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
 };
 
-class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, css::io::XStream, css::io::XOutputStream, css::io::XTruncate >
+class UNOTOOLS_DLLPUBLIC OStreamWrapper
+        : public cppu::ImplInheritanceHelper<OSeekableInputStreamWrapper,
+                                             css::io::XStream,
+                                             css::io::XOutputStream,
+                                             css::io::XTruncate>
 {
 protected:
     ~OStreamWrapper() override;
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 0c62e6ccfdf5..0792c85bf3fd 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -128,7 +128,7 @@ AccessibleRelationSetHelper::AccessibleRelationSetHelper ()
 }
 
 AccessibleRelationSetHelper::AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper)
-    : cppu::WeakImplHelper1<XAccessibleRelationSet>()
+    : cppu::WeakImplHelper<XAccessibleRelationSet>()
 {
     if (rHelper.mpHelperImpl)
         mpHelperImpl.reset(new AccessibleRelationSetHelperImpl(*rHelper.mpHelperImpl));
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index aa9e8a756adf..549c360e3c0b 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -137,7 +137,7 @@ AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialSt
 }
 
 AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelper& rHelper)
-    : cppu::WeakImplHelper1<XAccessibleStateSet>()
+    : cppu::WeakImplHelper<XAccessibleStateSet>()
 {
     if (rHelper.mpHelperImpl)
         mpHelperImpl.reset(new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl));