tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, in chart2.

Change-Id: Ib145860cf757d932fd5710f92c7f9ce33904b619

15 files changed, 31 insertions, 34 deletions

diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 275e2b233a0c..612071081b2b 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CHART2_SOURCE_INC_CACHEDDATASEQUENCE_HXX
 
 // helper classes
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/propertycontainer.hxx>
@@ -44,7 +44,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper7<
+typedef ::cppu::WeakComponentImplHelper<
     ::com::sun::star::chart2::data::XDataSequence,
     ::com::sun::star::chart2::data::XNumericalDataSequence,
     ::com::sun::star::chart2::data::XTextualDataSequence,
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index e2d1db3d784d..d9d2fc594e6b 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -21,7 +21,7 @@
 
 #include "ConfigItemListener.hxx"
 #include "charttoolsdllapi.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/chart2/XColorScheme.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,7 +43,7 @@ class ChartConfigItem;
 
 class ConfigColorScheme :
     public ConfigItemListener,
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XColorScheme,
         ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index 976769b24ba1..75810fe53978 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -23,14 +23,14 @@
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 
 namespace chart
 {
 
 class DataSource : public
-    ::cppu::WeakImplHelper3<
+    ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::chart2::data::XDataSource,
         ::com::sun::star::chart2::data::XDataSink >
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 6ba4fc324488..baf307c42da2 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -24,7 +24,7 @@
 #include "charttoolsdllapi.hxx"
 #include "LineProperties.hxx"
 
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -47,7 +47,7 @@ OOO_DLLPUBLIC_CHARTTOOLS    ::com::sun::star::uno::Reference< ::com::sun::star::
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper8<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 38c922b0e67b..18bf2e08af5b 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include "charttoolsdllapi.hxx"
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 1cbcbddd0ee7..9c66e57c1e65 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "CachedDataSequence.hxx"
 
@@ -43,7 +43,7 @@ namespace chart
 namespace impl
 {
 
-typedef ::cppu::WeakImplHelper7<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XInternalDataProvider,
         ::com::sun::star::chart2::data::XRangeXMLConversion,
         ::com::sun::star::chart2::XAnyDescriptionAccess,
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index ec938db8c426..0bbf37634bf6 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -21,7 +21,7 @@
 
 #include "MutexContainer.hxx"
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -34,7 +34,7 @@ namespace chart
 
 namespace impl
 {
-typedef cppu::WeakImplHelper2<
+typedef cppu::WeakImplHelper<
         ::com::sun::star::chart2::data::XLabeledDataSequence2,
         ::com::sun::star::lang::XServiceInfo >
     LabeledDataSequence_Base;
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 648354044d41..42729897c557 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include "MutexContainer.hxx"
@@ -53,7 +52,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::uti
  */
 class ModifyEventForwarder :
         public MutexContainer,
-        public ::cppu::WeakComponentImplHelper2<
+        public ::cppu::WeakComponentImplHelper<
             ::com::sun::star::util::XModifyBroadcaster,
             ::com::sun::star::util::XModifyListener >
 {
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index aac5a4faf996..d1efd6a5f4ab 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "charttoolsdllapi.hxx"
 
 #include <map>
@@ -37,7 +37,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::con
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::container::XNameContainer,
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::util::XCloneable >
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index e27c6d11ec49..45d992dc2b09 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CHART2_SOURCE_INC_RANGEHIGHLIGHTER_HXX
 
 #include "MutexContainer.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/chart2/data/XRangeHighlighter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -37,7 +37,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
         ::com::sun::star::chart2::data::XRangeHighlighter,
         ::com::sun::star::view::XSelectionChangeListener
     >
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index 403eb01dc844..4bfd25cd9070 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVECALCULATOR_HXX
 #define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVECALCULATOR_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
@@ -28,7 +28,7 @@ namespace chart
 {
 
 class RegressionCurveCalculator : public
-    cppu::WeakImplHelper1< com::sun::star::chart2::XRegressionCurveCalculator >
+    cppu::WeakImplHelper< com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     RegressionCurveCalculator();
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 2602d50b188d..66d40fbc6760 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace chart
 {
@@ -32,7 +32,7 @@ namespace chart
 */
 
 class LogarithmicScaling :
-        public ::cppu::WeakImplHelper3 <
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName,
         ::com::sun::star::lang::XServiceInfo
@@ -83,7 +83,7 @@ private:
 };
 
 class ExponentialScaling :
-        public ::cppu::WeakImplHelper3 <
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName,
         ::com::sun::star::lang::XServiceInfo
@@ -133,7 +133,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >      m_xContext;
 };
 
-class LinearScaling : public ::cppu::WeakImplHelper3 <
+class LinearScaling : public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName,
         ::com::sun::star::lang::XServiceInfo
@@ -184,7 +184,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >      m_xContext;
 };
 
-class PowerScaling : public ::cppu::WeakImplHelper3 <
+class PowerScaling : public ::cppu::WeakImplHelper<
         ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName,
         ::com::sun::star::lang::XServiceInfo
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index f4ca955a352c..748c07a826db 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CHART2_SOURCE_INC_UNCACHEDDATASEQUENCE_HXX
 
 // helper classes
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/propertycontainer.hxx>
@@ -48,7 +48,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper8<
+typedef ::cppu::WeakComponentImplHelper<
     ::com::sun::star::chart2::data::XDataSequence,
     ::com::sun::star::chart2::data::XNumericalDataSequence,
     ::com::sun::star::chart2::data::XTextualDataSequence,
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index 1b7c3def267f..dd364a874886 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace chart
 {
@@ -43,7 +43,7 @@ namespace chart
  */
 template< class Listener >
     class WeakListenerAdapter : public
-    ::cppu::WeakImplHelper1< Listener >
+    ::cppu::WeakImplHelper< Listener >
 {
 public:
     explicit WeakListenerAdapter( const ::com::sun::star::uno::Reference< Listener > & xListener ) :
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 5e384bab52a2..868bef8d8d5b 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/Property.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 
 #include <algorithm>
@@ -38,7 +38,7 @@ namespace chart
 
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet :
                            public MutexContainer
-                         , public ::cppu::WeakImplHelper4
+                         , public ::cppu::WeakImplHelper
                          < ::com::sun::star::beans::XPropertySet
                          , ::com::sun::star::beans::XMultiPropertySet
                          , ::com::sun::star::beans::XPropertyState