summaryrefslogtreecommitdiff
path: root/chart2/source/controller/chartapiwrapper
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-07-10 16:29:31 +0900
committerNoel Grandin <noel@peralex.com>2015-07-17 09:39:04 +0200
commit5c420fcdf9f36852df793b9944db4491271d23cf (patch)
tree414b715e4b91d9eb6cf0c44ca12ebd91da0a82b9 /chart2/source/controller/chartapiwrapper
parent5f9cde384aa213cf8cf6c84a005647e59bc58ae6 (diff)
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in chart2. Change-Id: Ib145860cf757d932fd5710f92c7f9ce33904b619
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx4
10 files changed, 20 insertions, 20 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 6e28ff50762a..0b67f073e2f9 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 4178c910f17b..df2265478e56 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 f1781ee4651e..c074d57900ca 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 1fff20bd0862..f8080ff6bc9c 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 03af0e6e5fa4..55f3298d177a 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 c0467f9277d2..28abcb1ca48a 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 7fb2f9c116be..d1b411091c17 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 e8cf9e8b55c5..8910bcf99d1e 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 340da198447c..3c509fc59601 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 58d43b2056de..14af06365718 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