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

with the variadic variants.

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

28 files changed, 46 insertions, 52 deletions

diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index b77d0cd60eea..a9c61b71ece3 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include "RptDef.hxx"
 
@@ -32,7 +32,7 @@
 namespace rptui
 {
 
-    typedef ::cppu::WeakComponentImplHelper1<   ::com::sun::star::beans::XPropertyChangeListener
+    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
                                     >   OPropertyForward_Base;
 
     /** \class OPropertyMediator
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index b64b0a8e7ca7..1190412646e8 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/document/XUndoManager.hpp>
 
-#include <cppuhelper/implbase3.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/sequence.hxx>
 #include <svl/lstner.hxx>
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index aa7936180249..78a36c5c602f 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <memory>
 #include <svl/lstner.hxx>
 
@@ -34,7 +34,7 @@ namespace rptui
 
 
     class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment
-        : public ::cppu::WeakImplHelper3<   ::com::sun::star::beans::XPropertyChangeListener
+        : public ::cppu::WeakImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
                                         ,   ::com::sun::star::container::XContainerListener
                                         ,   ::com::sun::star::util::XModifyListener
                                         >
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 712651d84caa..d917616b0f11 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -153,7 +153,7 @@
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cstdlib>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 3f86109aa2c2..e6b317fc9620 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -104,6 +104,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <dbaccess/dbaundomanager.hxx>
@@ -237,7 +238,7 @@ typedef ::comphelper::OPropertyStateContainer       OStyle_PBASE;
 class OStyle;
 typedef ::comphelper::OPropertyArrayUsageHelper <   OStyle
                                                 >   OStyle_PABASE;
-typedef ::cppu::WeakImplHelper2< style::XStyle, beans::XMultiPropertyStates> TStyleBASE;
+typedef ::cppu::WeakImplHelper< style::XStyle, beans::XMultiPropertyStates> TStyleBASE;
 
 class OStyle :   public ::comphelper::OMutexAndBroadcastHelper
                 ,public TStyleBASE
@@ -2276,7 +2277,7 @@ OUString SAL_CALL OReportDefinition::getShapeType(  ) throw (uno::RuntimeExcepti
    return OUString("com.sun.star.drawing.OLE2Shape");
 }
 
-typedef ::cppu::WeakImplHelper2< container::XNameContainer,
+typedef ::cppu::WeakImplHelper< container::XNameContainer,
                              container::XIndexAccess
                             > TStylesBASE;
 class OStylesHelper:
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index f63a91242911..52c30227730e 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedLine.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
@@ -31,7 +31,7 @@
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XFixedLine > FixedLinePropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XFixedLine
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XFixedLine
                                                 ,com::sun::star::lang::XServiceInfo > FixedLineBase;
 
     /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index e1b198a210ac..8a5ce95df61d 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedText.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
@@ -32,7 +32,7 @@
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XFixedText > FixedTextPropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XFixedText
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XFixedText
                                                 ,com::sun::star::lang::XServiceInfo > FixedTextBase;
 
     /** \class OFixedText Defines the implementation of a \interface com:::sun::star::report::XFixedText
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index d7739f76385b..d70ce5a4d587 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFormatCondition.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
@@ -30,7 +30,7 @@
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XFormatCondition   > FormatConditionPropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XFormatCondition
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XFormatCondition
                                                 ,com::sun::star::lang::XServiceInfo > FormatConditionBase;
 
     /** \class OFormatCondition Defines the implementation of a \interface com:::sun::star::report::XFormatCondition
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 55140f014ef6..1b25ce0e6bd6 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -23,14 +23,14 @@
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/report/Function.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XFormattedField    > FormattedFieldPropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XFormattedField
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XFormattedField
                                                 ,com::sun::star::lang::XServiceInfo > FormattedFieldBase;
 
     /** \class OFormattedField Defines the implementation of a \interface com:::sun::star::report::XFormattedField
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index 967f0350b68e..ca221f096678 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -23,13 +23,13 @@
 #include <com/sun/star/report/XFunction.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XFunction  > FunctionPropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XFunction
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XFunction
                                                 ,com::sun::star::lang::XServiceInfo > FunctionBase;
 
     /** \class OFunction Defines the implementation of a \interface com:::sun::star::report::XFunction
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index fdcd0a461a96..c835c7e1a8b8 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/report/XFunctions.hpp>
 #include <com/sun/star/report/XFunctionsSupplier.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <list>
@@ -29,7 +29,7 @@
 
 namespace reportdesign
 {
-    typedef ::cppu::WeakComponentImplHelper1< com::sun::star::report::XFunctions> FunctionsBase;
+    typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFunctions> FunctionsBase;
     /** \class OFunctions Defines the implementation of a \interface com:::sun::star::report::XFunctions
      * \ingroup reportdesign_api
      *
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 443666836d2a..c63c68152ce4 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUP_HXX
 
 #include <com/sun/star/report/XGroup.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
@@ -31,7 +31,7 @@
 
 namespace reportdesign
 {
-    typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XGroup
+    typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XGroup
                                          ,   ::com::sun::star::lang::XServiceInfo> GroupBase;
     typedef ::cppu::PropertySetMixin< com::sun::star::report::XGroup> GroupPropertySet;
 
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index c2cf03a45d1e..7099aaa5c177 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUPS_HXX
 
 #include <com/sun/star/report/XGroups.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <list>
@@ -28,7 +28,7 @@
 
 namespace reportdesign
 {
-    typedef ::cppu::WeakComponentImplHelper1< com::sun::star::report::XGroups> GroupsBase;
+    typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XGroups> GroupsBase;
     /** \class OGroups Defines the implementation of a \interface com:::sun::star::report::XGroups
      * \ingroup reportdesign_api
      *
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index b62f39474afc..dc63e19ce5f1 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XImageControl.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
@@ -30,7 +30,7 @@
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XImageControl  > ImageControlPropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XImageControl
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XImageControl
                                                 ,com::sun::star::lang::XServiceInfo     > ImageControlBase;
 
     /** \class OImageControl Defines the implementation of a \interface com:::sun::star::report::XImageControl
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 33f4f2b0b1ed..ec8153ff43f4 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -24,7 +24,7 @@
 #include <map>
 
 #include <com/sun/star/report/XReportEngine.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/types.hxx>
@@ -37,7 +37,7 @@
 
 namespace reportdesign
 {
-    typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XReportEngine
+    typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XReportEngine
                                              ,com::sun::star::lang::XServiceInfo> ReportEngineBase;
     typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportEngine> ReportEnginePropertySet;
 
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index 4903bf77744e..353941a13a34 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 
@@ -32,7 +32,7 @@ class OObjectBase;
 // OObjectListener
 
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener > TPropertyChangeListenerHelper;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener > TPropertyChangeListenerHelper;
 
 class OObjectListener: public TPropertyChangeListenerHelper
 {
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 70b6159fd7cb..96aeb472dfdc 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SECTION_HXX
 
 #include <com/sun/star/report/XSection.hpp>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/types.hxx>
@@ -36,7 +36,7 @@
 
 namespace reportdesign
 {
-    typedef ::cppu::WeakComponentImplHelper6
+    typedef ::cppu::WeakComponentImplHelper
         <   ::com::sun::star::report::XSection
         ,   ::com::sun::star::lang::XServiceInfo
         ,   ::com::sun::star::lang::XUnoTunnel
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index d0da9068f3ad..ab852e0bc299 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XShape.hpp>
 #include "ReportControlModel.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
@@ -32,7 +32,7 @@
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        com::sun::star::report::XShape > ShapePropertySet;
-    typedef ::cppu::WeakComponentImplHelper2<    com::sun::star::report::XShape
+    typedef ::cppu::WeakComponentImplHelper<    com::sun::star::report::XShape
                                                 ,com::sun::star::lang::XServiceInfo > ShapeBase;
 
     /** \class OShape Defines the implementation of a \interface com:::sun::star::report::XShape
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index edd8387d8624..d5fcdab115a3 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <vcl/svapp.hxx>
 #include <ucbhelper/content.hxx>
@@ -64,7 +64,7 @@
 namespace rptxml
 {
 
-    class ORptTypeDetection : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo>
+    class ORptTypeDetection : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo>
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
 public:
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 0d37284c0c47..190cbeb2f63c 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -32,8 +32,6 @@
 #include <com/sun/star/report/XReportControlModel.hpp>
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <osl/diagnose.h>
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 6bba19178761..bfd381c310cf 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx
index 39d57589cce6..134d4f7740b4 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.hxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase2.hxx>
 #include <svtools/transfer.hxx>
 #include "GroupsSorting.hxx"
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index dc604e8fea86..88bc3164a971 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -38,7 +38,7 @@
 #include "ReportController.hxx"
 #include "ColumnInfo.hxx"
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/property.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
@@ -81,7 +81,7 @@ using namespace ::comphelper;
   * Separated out from OFieldExpressionControl to prevent collision of ref-counted base classes
   */
 class OFieldExpressionControl;
-class OFieldExpressionControlContainerListener : public ::cppu::WeakImplHelper1< container::XContainerListener >
+class OFieldExpressionControlContainerListener : public ::cppu::WeakImplHelper< container::XContainerListener >
 {
     VclPtr<OFieldExpressionControl> mpParent;
 public:
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index b1faf767eb65..b89e7d26a0b7 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -42,7 +42,7 @@ namespace rptui
 
     class OPropertyInfoService;
 
-    typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::inspection::XPropertyHandler
+    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::inspection::XPropertyHandler
                                             ,   ::com::sun::star::lang::XServiceInfo> DataProviderHandler_Base;
 
     class DataProviderHandler:
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 80ab1ba06523..592305371eac 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
@@ -60,7 +60,7 @@ namespace rptui
     typedef ::comphelper::OSimpleListenerContainer  <   ::com::sun::star::beans::XPropertyChangeListener
                                                     ,   ::com::sun::star::beans::PropertyChangeEvent
                                                     >   PropertyChangeListeners;
-    typedef ::cppu::WeakComponentImplHelper3<   ::com::sun::star::inspection::XPropertyHandler
+    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::inspection::XPropertyHandler
                                             ,   ::com::sun::star::beans::XPropertyChangeListener
                                             ,   ::com::sun::star::lang::XServiceInfo> GeometryHandler_Base;
 
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 2c6c2215a0aa..fae48f2b83cd 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace rptui
 
     class OPropertyInfoService;
 
-    typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::inspection::XPropertyHandler
+    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::inspection::XPropertyHandler
                                             ,   ::com::sun::star::lang::XServiceInfo> ReportComponentHandler_Base;
 
     class ReportComponentHandler:
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 786618c7b9ab..ea440d319132 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <memory>
 #include <dllapi.h>
@@ -41,7 +41,7 @@ namespace rptui
 
 
     class OXReportControllerObserver
-        : public ::cppu::WeakImplHelper3<   ::com::sun::star::beans::XPropertyChangeListener
+        : public ::cppu::WeakImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
                                         ,   ::com::sun::star::container::XContainerListener
                                         ,   ::com::sun::star::util::XModifyListener
                                         >
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 0ea6b88052d0..6c2b01091e9d 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -22,7 +22,6 @@
 #include <RptResId.hrc>
 #include "ModuleHelper.hxx"
 #include "helpids.hrc"
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>