tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, in chart2.

Change-Id: Ib145860cf757d932fd5710f92c7f9ce33904b619

17 files changed, 34 insertions, 34 deletions

diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index ec6441ebca80..46ffd5a7e848 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -21,7 +21,7 @@
 
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -38,7 +38,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper6
+typedef ::cppu::WeakImplHelper
     < ::com::sun::star::lang::XServiceInfo,
       ::com::sun::star::chart2::XCoordinateSystem,
       ::com::sun::star::chart2::XChartTypeContainer,
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 092fa6f5c09b..4b89039f43e6 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -21,7 +21,7 @@
 
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -33,7 +33,7 @@ namespace chart
 {
 
 class ChartTypeManager :
-        public ::cppu::WeakImplHelper3<
+        public ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
         ::com::sun::star::lang::XMultiServiceFactory,
         ::com::sun::star::chart2::XChartTypeManager >
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 5f61742d41e1..3c1d83071ef0 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 // helper classes
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <osl/mutex.hxx>
 
@@ -49,7 +49,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper8<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XDataSeries,
         ::com::sun::star::chart2::data::XDataSink,
         ::com::sun::star::chart2::data::XDataSource,
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index ddeb9bc92952..335e6f515462 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -21,7 +21,7 @@
 
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
@@ -43,7 +43,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper8<
+typedef ::cppu::WeakImplHelper<
     ::com::sun::star::chart2::XDiagram,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::chart2::XCoordinateSystemContainer,
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index c01b96dfc9d7..c655a5bd34d9 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -25,7 +25,7 @@
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 
 namespace chart
@@ -33,7 +33,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
         ::com::sun::star::util::XModifyListener >
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 0c44682148b2..0c762dad3f64 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_XMLFILTER_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_INC_XMLFILTER_HXX
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
@@ -51,7 +51,7 @@ namespace chart
 {
 
 class XMLFilter : public
-    ::cppu::WeakImplHelper4<
+    ::cppu::WeakImplHelper<
         ::com::sun::star::document::XFilter,
         ::com::sun::star::document::XExporter,
         ::com::sun::star::document::XImporter,
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 3f649325553a..f61e5dee3712 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include "ModifyListenerHelper.hxx"
@@ -38,7 +38,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XAxis,
         ::com::sun::star::chart2::XTitled,
         ::com::sun::star::lang::XServiceInfo,
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index c123492e902b..2a93042e71bb 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_DATAPOINT_HXX
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/container/XChild.hpp>
@@ -36,7 +36,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::container::XChild,
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 875c54df138c..a9113df9980f 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -21,7 +21,7 @@
 
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include "ModifyListenerHelper.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -34,7 +34,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
     css::chart2::XFormattedString2,
     css::lang::XServiceInfo,
     css::util::XCloneable,
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index 3e4fa7cd7e5e..677bf3cd76d5 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_GRIDPROPERTIES_HXX
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -37,7 +37,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 525b4d5c1939..b0f362e6bb3e 100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -22,7 +22,7 @@
 #include "ModifyListenerHelper.hxx"
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/chart2/XLegend.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XLegend,
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::util::XCloneable,
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index ed8148b14d99..bbe342eb983e 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "ModifyListenerHelper.hxx"
 #include <comphelper/uno3.hxx>
@@ -34,7 +34,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
         ::com::sun::star::util::XModifyListener,
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index 05f2d0181d50..b9e4fb0b069b 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -22,7 +22,7 @@
 #include "ModifyListenerHelper.hxx"
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/chart2/XTitle.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -34,7 +34,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
     ::com::sun::star::chart2::XTitle,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::util::XCloneable,
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index ef87681e4ed7..b8623ccd1033 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -27,7 +27,7 @@
 #include <cppuhelper/weak.hxx>
 
 #include "ModifyListenerHelper.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 
 namespace chart
@@ -35,7 +35,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
         ::com::sun::star::util::XModifyListener >
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 84831b01f7ae..bf801764dd34 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -21,7 +21,7 @@
 
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include "ModifyListenerHelper.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -37,7 +37,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
         ::com::sun::star::chart2::XChartType,
         ::com::sun::star::chart2::XDataSeriesContainer,
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 1ea7bb2ab756..ab376cbbefeb 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CHARTTYPETEMPLATE_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CHARTTYPETEMPLATE_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "DataInterpreter.hxx"
 #include "StackMode.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -69,7 +69,7 @@ namespace chart
 
     * create an XLegend via the global service factory, set it at the diagram.
  */
-class ChartTypeTemplate : public ::cppu::WeakImplHelper2<
+class ChartTypeTemplate : public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XChartTypeTemplate,
         ::com::sun::star::lang::XServiceName >
 {
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 7c2cd4a191c2..93e39bb0acb6 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/chart2/XDataInterpreter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -27,7 +27,7 @@
 namespace chart
 {
 
-class DataInterpreter : public ::cppu::WeakImplHelper2<
+class DataInterpreter : public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XDataInterpreter,
         ::com::sun::star::lang::XServiceInfo >
 {