[Libreoffice-commits] core.git: chart2/inc chart2/source chart2/workbench
Takeshi Abe
tabe at fixedpoint.jp
Fri Jul 17 00:41:57 PDT 2015
chart2/inc/ChartView.hxx | 4 ++--
chart2/inc/pch/precompiled_chartcore.hxx | 2 +-
chart2/inc/pch/precompiled_chartopengl.hxx | 2 +-
chart2/source/controller/accessibility/AccessibleChartElement.hxx | 4 ++--
chart2/source/controller/accessibility/AccessibleChartShape.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/GridWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx | 4 ++--
chart2/source/controller/inc/AccessibleBase.hxx | 4 ++--
chart2/source/controller/inc/AccessibleChartView.hxx | 4 ++--
chart2/source/controller/inc/AccessibleTextHelper.hxx | 4 ++--
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 4 ++--
chart2/source/controller/inc/RangeSelectionListener.hxx | 4 ++--
chart2/source/controller/main/ChartFrameloader.hxx | 4 ++--
chart2/source/controller/main/CommandDispatch.hxx | 4 ++--
chart2/source/controller/main/ControllerCommandDispatch.hxx | 4 ++--
chart2/source/controller/main/StatusBarCommandDispatch.hxx | 4 ++--
chart2/source/controller/main/UndoActions.hxx | 6 +++---
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 +-
chart2/source/inc/CachedDataSequence.hxx | 4 ++--
chart2/source/inc/ConfigColorScheme.hxx | 4 ++--
chart2/source/inc/DataSource.hxx | 4 ++--
chart2/source/inc/ErrorBar.hxx | 4 ++--
chart2/source/inc/ExplicitCategoriesProvider.hxx | 2 --
chart2/source/inc/InternalDataProvider.hxx | 4 ++--
chart2/source/inc/LabeledDataSequence.hxx | 4 ++--
chart2/source/inc/ModifyListenerHelper.hxx | 5 ++---
chart2/source/inc/NameContainer.hxx | 4 ++--
chart2/source/inc/RangeHighlighter.hxx | 4 ++--
chart2/source/inc/RegressionCurveCalculator.hxx | 4 ++--
chart2/source/inc/Scaling.hxx | 10 +++++-----
chart2/source/inc/UncachedDataSequence.hxx | 4 ++--
chart2/source/inc/WeakListenerAdapter.hxx | 4 ++--
chart2/source/inc/WrappedPropertySet.hxx | 4 ++--
chart2/source/model/inc/BaseCoordinateSystem.hxx | 4 ++--
chart2/source/model/inc/ChartTypeManager.hxx | 4 ++--
chart2/source/model/inc/DataSeries.hxx | 4 ++--
chart2/source/model/inc/Diagram.hxx | 4 ++--
chart2/source/model/inc/StockBar.hxx | 4 ++--
chart2/source/model/inc/XMLFilter.hxx | 4 ++--
chart2/source/model/main/Axis.hxx | 4 ++--
chart2/source/model/main/DataPoint.hxx | 4 ++--
chart2/source/model/main/FormattedString.hxx | 4 ++--
chart2/source/model/main/GridProperties.hxx | 4 ++--
chart2/source/model/main/Legend.hxx | 4 ++--
chart2/source/model/main/PageBackground.hxx | 4 ++--
chart2/source/model/main/Title.hxx | 4 ++--
chart2/source/model/main/Wall.hxx | 4 ++--
chart2/source/model/template/ChartType.hxx | 4 ++--
chart2/source/model/template/ChartTypeTemplate.hxx | 4 ++--
chart2/source/model/template/DataInterpreter.hxx | 4 ++--
chart2/source/tools/ModifyListenerCallBack.cxx | 4 ++--
chart2/source/tools/ModifyListenerHelper.cxx | 2 +-
chart2/source/tools/RegressionCurveModel.hxx | 4 ++--
chart2/source/tools/RegressionEquation.hxx | 4 ++--
chart2/source/view/axes/DateScaling.hxx | 6 +++---
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 3 ++-
chart2/source/view/inc/Linear3DTransformation.hxx | 4 ++--
chart2/source/view/inc/PlotterBase.hxx | 1 -
chart2/source/view/inc/VPolarTransformation.hxx | 4 ++--
chart2/source/view/main/DummyXShape.cxx | 4 ++--
chart2/workbench/addin/sampleaddin.hxx | 4 ++--
69 files changed, 135 insertions(+), 138 deletions(-)
New commits:
commit 5c420fcdf9f36852df793b9944db4491271d23cf
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jul 10 16:29:31 2015 +0900
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in chart2.
Change-Id: Ib145860cf757d932fd5710f92c7f9ce33904b619
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 0da480d..1ac31ec 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -21,7 +21,7 @@
#include "ChartModel.hxx"
#include "chartview/ExplicitValueProvider.hxx"
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <svl/lstner.hxx>
@@ -88,7 +88,7 @@ struct TimeBasedInfo
* The View is not responsible to handle single user events (that is instead
* done by the ChartWindow).
*/
-class ChartView : public ::cppu::WeakImplHelper10<
+class ChartView : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XInitialization
,::com::sun::star::lang::XServiceInfo
,::com::sun::star::datatransfer::XTransferable
diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx
index 4999b67..30ecb46 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -225,7 +225,7 @@
#include <comphelper/servicehelper.hxx>
#include <comphelper/storagehelper.hxx>
#include <config_features.h>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx b/chart2/inc/pch/precompiled_chartopengl.hxx
index c46509d..667de26 100644
--- a/chart2/inc/pch/precompiled_chartopengl.hxx
+++ b/chart2/inc/pch/precompiled_chartopengl.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <comphelper/InlineContainer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <editeng/unoprnms.hxx>
#include <fstream>
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index cfcb159..9353b2d 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <comphelper/accessibleeventnotifier.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <unotools/accessiblestatesethelper.hxx>
@@ -59,7 +59,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
AccessibleBase,
::com::sun::star::accessibility::XAccessibleExtendedComponent
> AccessibleChartElement_Base;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index 07c1c99..71bdbce 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -22,7 +22,7 @@
#include "AccessibleBase.hxx"
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svx/AccessibleShapeTreeInfo.hxx>
namespace accessibility
@@ -35,7 +35,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
AccessibleBase,
::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleChartShape_Base;
}
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 6e28ff5..0b67f07 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_AREAWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/drawing/XShape.hpp>
@@ -39,7 +39,7 @@ namespace wrapper
class Chart2ModelContact;
-class AreaWrapper : public ::cppu::ImplInheritanceHelper3<
+class AreaWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::drawing::XShape
, com::sun::star::lang::XComponent
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 4178c91..df22654 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -21,7 +21,7 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/chart/XAxis.hpp>
@@ -41,7 +41,7 @@ namespace wrapper
{
class Chart2ModelContact;
-class AxisWrapper : public ::cppu::ImplInheritanceHelper5<
+class AxisWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::chart::XAxis
, com::sun::star::drawing::XShape
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index f1781ee..c074d57 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX
#include "MutexContainer.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
#include <com/sun/star/chart/XDateCategories.hpp>
@@ -40,7 +40,7 @@ class Chart2ModelContact;
struct lcl_Operator;
class ChartDataWrapper : public MutexContainer, public
- ::cppu::WeakImplHelper5<
+ ::cppu::WeakImplHelper<
com::sun::star::chart2::XAnyDescriptionAccess,
com::sun::star::chart::XDateCategories,
com::sun::star::lang::XServiceInfo,
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 1fff20b..f8080ff 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -21,7 +21,7 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/chart2/XDataSeries.hpp>
@@ -42,7 +42,7 @@ namespace wrapper
class Chart2ModelContact;
-class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper4<
+class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::lang::XServiceInfo
, com::sun::star::lang::XInitialization
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 03af0e6..55f3298 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_GRIDWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/drawing/XShape.hpp>
@@ -38,7 +38,7 @@ namespace wrapper
class Chart2ModelContact;
-class GridWrapper : public ::cppu::ImplInheritanceHelper2<
+class GridWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::lang::XComponent
, com::sun::star::lang::XServiceInfo
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index c0467f9..28abcb1 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -21,7 +21,7 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/drawing/XShape.hpp>
@@ -41,7 +41,7 @@ namespace wrapper
class Chart2ModelContact;
-class LegendWrapper : public ::cppu::ImplInheritanceHelper3<
+class LegendWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::drawing::XShape
, com::sun::star::lang::XComponent
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 7fb2f9c..d1b4110 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/chart2/XDiagram.hpp>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
@@ -45,7 +45,7 @@ namespace wrapper
class Chart2ModelContact;
class MinMaxLineWrapper : public MutexContainer
- , public ::cppu::WeakImplHelper6
+ , public ::cppu::WeakImplHelper
< ::com::sun::star::lang::XComponent
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index e8cf9e8..8910bcf 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -23,7 +23,7 @@
#include "ReferenceSizePropertyProvider.hxx"
#include "Chart2ModelContact.hxx"
#include "TitleHelper.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/drawing/XShape.hpp>
@@ -39,7 +39,7 @@ namespace chart
namespace wrapper
{
-class TitleWrapper : public ::cppu::ImplInheritanceHelper3<
+class TitleWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::drawing::XShape
, com::sun::star::lang::XComponent
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 340da19..3c509fc 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/chart2/XDiagram.hpp>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
@@ -44,7 +44,7 @@ namespace wrapper
class Chart2ModelContact;
class UpDownBarWrapper : public MutexContainer
- , public ::cppu::WeakImplHelper6
+ , public ::cppu::WeakImplHelper
< ::com::sun::star::lang::XComponent
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 58d43b2..14af063 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WALLFLOORWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/lang/XComponent.hpp>
@@ -37,7 +37,7 @@ namespace wrapper
class Chart2ModelContact;
-class WallFloorWrapper : public ::cppu::ImplInheritanceHelper2<
+class WallFloorWrapper : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, com::sun::star::lang::XComponent
, com::sun::star::lang::XServiceInfo
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index fc16dd1..8034aa7 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <comphelper/accessibleeventnotifier.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <unotools/accessiblestatesethelper.hxx>
@@ -79,7 +79,7 @@ struct AccessibleElementInfo
namespace impl
{
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent,
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 5e20108..049347f 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -21,7 +21,7 @@
#include "AccessibleBase.hxx"
#include "MutexContainer.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -46,7 +46,7 @@ class ExplicitValueProvider;
namespace impl
{
-typedef ::cppu::ImplInheritanceHelper2<
+typedef ::cppu::ImplInheritanceHelper<
::chart::AccessibleBase,
::com::sun::star::lang::XInitialization,
::com::sun::star::view::XSelectionChangeListener >
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 135ea23..38adaeb 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ACCESSIBLETEXTHELPER_HXX
#include "MutexContainer.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -37,7 +37,7 @@ class DrawViewWrapper;
namespace impl
{
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::lang::XInitialization,
::com::sun::star::accessibility::XAccessibleContext >
AccessibleTextHelper_Base;
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 96e2ee9..a162ed1 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <unotools/eventlisteneradapter.hxx>
#include <comphelper/uno3.hxx>
@@ -43,7 +43,7 @@ namespace wrapper
class Chart2ModelContact;
-class ChartDocumentWrapper_Base : public ::cppu::ImplInheritanceHelper5
+class ChartDocumentWrapper_Base : public ::cppu::ImplInheritanceHelper
< WrappedPropertySet
, ::com::sun::star::chart::XChartDocument
, ::com::sun::star::drawing::XDrawPageSupplier
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index 1e98521..9bb9a7a 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONLISTENER_HXX
#include "ControllerLockGuard.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/sheet/XRangeSelectionListener.hpp>
@@ -38,7 +38,7 @@ protected:
};
class RangeSelectionListener : public
- ::cppu::WeakImplHelper1<
+ ::cppu::WeakImplHelper<
::com::sun::star::sheet::XRangeSelectionListener >
{
public:
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 3d4e7af..d1e995a 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -23,12 +23,12 @@
#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace chart
{
-class ChartFrameLoader : public ::cppu::WeakImplHelper2<
+class ChartFrameLoader : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XSynchronousFrameLoader
, ::com::sun::star::lang::XServiceInfo
//comprehends XComponent (required interface)
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index e4255b2..13991bb 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_COMMANDDISPATCH_HXX
#include "MutexContainer.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -34,7 +34,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::frame::XDispatch,
::com::sun::star::util::XModifyListener >
CommandDispatch_Base;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index 049c0f2..db65069 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -40,7 +40,7 @@ struct ControllerState;
// #i63017# : need to implement the XSelectionChangeListener in order
// to update the ControllerState when the selection changes.
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
CommandDispatch,
::com::sun::star::view::XSelectionChangeListener >
ControllerCommandDispatch_Base;
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index 09471c3..07dc883 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -21,7 +21,7 @@
#include "CommandDispatch.hxx"
#include "ObjectIdentifier.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/util/XModifiable.hpp>
@@ -36,7 +36,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
CommandDispatch,
::com::sun::star::view::XSelectionChangeListener >
StatusBarCommandDispatch_Base;
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index c38bba2..972ffe3 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <utility>
@@ -46,7 +46,7 @@ namespace impl
{
typedef ::cppu::BaseMutex UndoElement_MBase;
-typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > UndoElement_TBase;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XUndoAction > UndoElement_TBase;
class UndoElement :public UndoElement_MBase
,public UndoElement_TBase
@@ -89,7 +89,7 @@ private:
};
typedef ::cppu::BaseMutex ShapeUndoElement_MBase;
-typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase;
class ShapeUndoElement :public ShapeUndoElement_MBase
,public ShapeUndoElement_TBase
{
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index b8b1b5a..c42407c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -99,7 +99,7 @@ sal_Int32 getDataLabelPlacement(css::uno::Reference<css::frame::XModel> xModel,
ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY );
if (!xSeries.is())
- return false;
+ return 0;
css::uno::Any aAny = xSeries->getPropertyValue("LabelPlacement");
if (!aAny.hasValue())
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 275e2b2..6120710 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 e2d1db3..d9d2fc5 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 976769b..75810fe 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 6ba4fc3..baf307c4 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 38c922b..18bf2e0 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 1cbcbdd..9c66e57 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 ec938db..0bbf376 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 6483540..4272989 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 aac5a4f..d1efd6a 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 e27c6d1..45d992d 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 403eb01..4bfd25c 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 2602d50..66d40fb 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 f4ca955..748c07a 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 1b7c3de..dd364a8 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 5e384ba..868bef8 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
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index ec6441e..46ffd5a 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 092fa6f..4b89039 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 5f61742..3c1d830 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 ddeb9bc..335e6f5 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 c01b96d..c655a5b 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 0c44682..0c762da 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 3f64932..f61e5de 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 c123492..2a93042 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 875c54d..a9113df 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 3e4fa7c..677bf3c 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 525b4d5..b0f362e 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 ed8148b..bbe342e 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 05f2d01..b9e4fb0 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 ef87681..b8623cc 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 84831b0..bf80176 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 1ea7bb2..ab376cb 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 7c2cd4a..93e39bb 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 >
{
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
index dd2f281..4b65256 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -19,14 +19,14 @@
#include "ModifyListenerCallBack.hxx"
#include "MutexContainer.hxx"
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
namespace chart {
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::util::XModifyListener >
ModifyListenerCallBack_Base;
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index f852279..b6d093e 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -95,7 +95,7 @@ uno::Reference< util::XModifyListener > createModifyEventForwarder()
}
ModifyEventForwarder::ModifyEventForwarder() :
- ::cppu::WeakComponentImplHelper2<
+ ::cppu::WeakComponentImplHelper<
::com::sun::star::util::XModifyBroadcaster,
::com::sun::star::util::XModifyListener >( m_aMutex ),
m_aModifyListeners( m_aMutex )
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index 0fedc2a..1bbb03b 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -23,7 +23,7 @@
#include "OPropertySet.hxx"
#include "ModifyListenerHelper.hxx"
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/chart2/XRegressionCurve.hpp>
@@ -38,7 +38,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XServiceName,
::com::sun::star::chart2::XRegressionCurve,
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 27f7efc..e20bba1 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -30,7 +30,7 @@
#include "OPropertySet.hxx"
#include "ModifyListenerHelper.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
namespace chart
@@ -38,7 +38,7 @@ namespace chart
namespace impl
{
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
::com::sun::star::util::XCloneable,
::com::sun::star::util::XModifyBroadcaster,
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
index f48518a..0bc3018 100644
--- a/chart2/source/view/axes/DateScaling.hxx
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -23,14 +23,14 @@
#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>
#include <tools/date.hxx>
namespace chart
{
class DateScaling :
- public ::cppu::WeakImplHelper3 <
+ public ::cppu::WeakImplHelper<
::com::sun::star::chart2::XScaling,
::com::sun::star::lang::XServiceName,
::com::sun::star::lang::XServiceInfo
@@ -70,7 +70,7 @@ private:
};
class InverseDateScaling :
- public ::cppu::WeakImplHelper3 <
+ public ::cppu::WeakImplHelper<
::com::sun::star::chart2::XScaling,
::com::sun::star::lang::XServiceName,
::com::sun::star::lang::XServiceInfo
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 81e044c..1f39e4f 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -24,6 +24,7 @@
#include "AxisIndexDefines.hxx"
#include "AxisHelper.hxx"
#include "ChartTypeHelper.hxx"
+#include <cppuhelper/implbase.hxx>
namespace chart
{
@@ -31,7 +32,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-class TextualDataProvider : public ::cppu::WeakImplHelper1<
+class TextualDataProvider : public ::cppu::WeakImplHelper<
::com::sun::star::chart2::data::XTextualDataSequence
>
{
diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx
index ca07905..bf8ba44 100644
--- a/chart2/source/view/inc/Linear3DTransformation.hxx
+++ b/chart2/source/view/inc/Linear3DTransformation.hxx
@@ -19,14 +19,14 @@
#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_LINEAR3DTRANSFORMATION_HXX
#define INCLUDED_CHART2_SOURCE_VIEW_INC_LINEAR3DTRANSFORMATION_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/chart2/XTransformation.hpp>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
namespace chart
{
-class Linear3DTransformation : public ::cppu::WeakImplHelper1<
+class Linear3DTransformation : public ::cppu::WeakImplHelper<
::com::sun::star::chart2::XTransformation
>
{
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 8cf01a9..af9ac88 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/XTransformation.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <vector>
namespace chart
diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx
index 3c85a00..7a2e3ab 100644
--- a/chart2/source/view/inc/VPolarTransformation.hxx
+++ b/chart2/source/view/inc/VPolarTransformation.hxx
@@ -20,13 +20,13 @@
#define INCLUDED_CHART2_SOURCE_VIEW_INC_VPOLARTRANSFORMATION_HXX
#include "PlottingPositionHelper.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/chart2/XTransformation.hpp>
namespace chart
{
-class VPolarTransformation : public ::cppu::WeakImplHelper1<
+class VPolarTransformation : public ::cppu::WeakImplHelper<
::com::sun::star::chart2::XTransformation
>
{
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 80856f6..b4b98fe 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -25,7 +25,7 @@
#include <vcl/svapp.hxx>
#include <tools/gen.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <editeng/unoprnms.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -77,7 +77,7 @@ void TextCache::insertBitmap(const TextCacheKey& rKey, const BitmapEx& rBitmap)
maCache.insert(std::pair<TextCacheKey, BitmapEx>(rKey, rBitmap));
}
-class DummyPropertySetInfo : public cppu::WeakImplHelper1<
+class DummyPropertySetInfo : public cppu::WeakImplHelper<
com::sun::star::beans::XPropertySetInfo >
{
public:
diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx
index e740ef0..d4187f6 100644
--- a/chart2/workbench/addin/sampleaddin.hxx
+++ b/chart2/workbench/addin/sampleaddin.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_CHART2_WORKBENCH_ADDIN_SAMPLEADDIN_HXX
#define INCLUDED_CHART2_WORKBENCH_ADDIN_SAMPLEADDIN_HXX
-#include <cppuhelper/implbase9.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/chart/XDiagram.hpp>
@@ -39,7 +39,7 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
SampleAddIn_CreateInstance(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& );
-class SampleAddIn : public cppu::WeakImplHelper9<
+class SampleAddIn : public cppu::WeakImplHelper<
com::sun::star::lang::XInitialization,
com::sun::star::chart::XDiagram,
com::sun::star::chart::XAxisXSupplier,
More information about the Libreoffice-commits
mailing list