[Libreoffice-commits] core.git: 4 commits - chart2/inc chart2/source
Noel Grandin
noel at peralex.com
Tue Dec 9 02:56:56 PST 2014
chart2/inc/ChartModel.hxx | 17 -
chart2/inc/ChartView.hxx | 11
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/GridWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 11
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 24 +
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx | 11
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 27 +
chart2/source/controller/inc/AccessibleChartView.hxx | 1
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 17 -
chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard.hxx | 1
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 17 -
chart2/source/controller/main/ChartController.cxx | 24 +
chart2/source/controller/main/ChartController.hxx | 18 -
chart2/source/controller/main/ChartFrameloader.cxx | 27 +
chart2/source/controller/main/ChartFrameloader.hxx | 16
chart2/source/controller/main/ElementSelector.cxx | 24 +
chart2/source/controller/main/ElementSelector.hxx | 17 -
chart2/source/inc/CachedDataSequence.hxx | 17 -
chart2/source/inc/ConfigColorScheme.hxx | 17 -
chart2/source/inc/DataSource.hxx | 17 -
chart2/source/inc/ErrorBar.hxx | 18 -
chart2/source/inc/ExplicitCategoriesProvider.hxx | 1
chart2/source/inc/InternalDataProvider.hxx | 17 -
chart2/source/inc/LabeledDataSequence.hxx | 18 -
chart2/source/inc/Scaling.hxx | 66 +++-
chart2/source/inc/ServiceMacros.hxx | 96 -----
chart2/source/inc/UncachedDataSequence.hxx | 11
chart2/source/inc/servicenames_coosystems.hxx | 6
chart2/source/model/filter/XMLFilter.cxx | 24 +
chart2/source/model/inc/BaseCoordinateSystem.hxx | 1
chart2/source/model/inc/CartesianCoordinateSystem.hxx | 43 ++
chart2/source/model/inc/ChartTypeManager.hxx | 7
chart2/source/model/inc/DataSeries.hxx | 17 -
chart2/source/model/inc/Diagram.hxx | 18 -
chart2/source/model/inc/PolarCoordinateSystem.hxx | 43 ++
chart2/source/model/inc/StockBar.hxx | 1
chart2/source/model/inc/XMLFilter.hxx | 17 -
chart2/source/model/main/Axis.cxx | 24 +
chart2/source/model/main/Axis.hxx | 17 -
chart2/source/model/main/CartesianCoordinateSystem.cxx | 74 ++++
chart2/source/model/main/ChartModel.cxx | 24 +
chart2/source/model/main/DataPoint.cxx | 24 +
chart2/source/model/main/DataPoint.hxx | 11
chart2/source/model/main/DataSeries.cxx | 25 +
chart2/source/model/main/Diagram.cxx | 25 +
chart2/source/model/main/FormattedString.cxx | 25 +
chart2/source/model/main/FormattedString.hxx | 17 -
chart2/source/model/main/GridProperties.cxx | 24 +
chart2/source/model/main/GridProperties.hxx | 17 -
chart2/source/model/main/Legend.cxx | 24 +
chart2/source/model/main/Legend.hxx | 17 -
chart2/source/model/main/PageBackground.cxx | 24 +
chart2/source/model/main/PageBackground.hxx | 17 -
chart2/source/model/main/PolarCoordinateSystem.cxx | 74 ++++
chart2/source/model/main/Title.cxx | 24 +
chart2/source/model/main/Title.hxx | 17 -
chart2/source/model/main/Wall.hxx | 1
chart2/source/model/template/AreaChartType.cxx | 25 +
chart2/source/model/template/AreaChartType.hxx | 7
chart2/source/model/template/BarChartType.cxx | 25 +
chart2/source/model/template/BarChartType.hxx | 7
chart2/source/model/template/BubbleChartType.cxx | 25 +
chart2/source/model/template/BubbleChartType.hxx | 7
chart2/source/model/template/CandleStickChartType.cxx | 25 +
chart2/source/model/template/CandleStickChartType.hxx | 7
chart2/source/model/template/ChartType.hxx | 1
chart2/source/model/template/ChartTypeManager.cxx | 26 +
chart2/source/model/template/ChartTypeTemplate.hxx | 4
chart2/source/model/template/ColumnChartType.cxx | 25 +
chart2/source/model/template/ColumnChartType.hxx | 7
chart2/source/model/template/DataInterpreter.cxx | 24 +
chart2/source/model/template/DataInterpreter.hxx | 11
chart2/source/model/template/FilledNetChartType.cxx | 25 +
chart2/source/model/template/FilledNetChartType.hxx | 7
chart2/source/model/template/GL3DBarChartType.cxx | 25 +
chart2/source/model/template/GL3DBarChartType.hxx | 7
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 1
chart2/source/model/template/LineChartType.cxx | 25 +
chart2/source/model/template/LineChartType.hxx | 7
chart2/source/model/template/NetChartType.cxx | 25 +
chart2/source/model/template/NetChartType.hxx | 7
chart2/source/model/template/PieChartType.cxx | 25 +
chart2/source/model/template/PieChartType.hxx | 7
chart2/source/model/template/ScatterChartType.cxx | 25 +
chart2/source/model/template/ScatterChartType.hxx | 7
chart2/source/tools/CachedDataSequence.cxx | 24 +
chart2/source/tools/ConfigColorScheme.cxx | 25 +
chart2/source/tools/DataSource.cxx | 24 +
chart2/source/tools/ErrorBar.cxx | 24 +
chart2/source/tools/InternalDataProvider.cxx | 24 +
chart2/source/tools/LabeledDataSequence.cxx | 25 +
chart2/source/tools/RegressionCurveModel.cxx | 162 +++++++++-
chart2/source/tools/RegressionCurveModel.hxx | 118 ++++++-
chart2/source/tools/RegressionEquation.cxx | 24 +
chart2/source/tools/RegressionEquation.hxx | 7
chart2/source/tools/Scaling.cxx | 93 +++++
chart2/source/tools/UncachedDataSequence.cxx | 24 +
chart2/source/view/axes/DateScaling.cxx | 47 ++
chart2/source/view/axes/DateScaling.hxx | 25 +
chart2/source/view/main/ChartView.cxx | 27 +
120 files changed, 2306 insertions(+), 374 deletions(-)
New commits:
commit feb92a5f3ca44a69e07eb29c23bd0d4010e2fd53
Author: Noel Grandin <noel at peralex.com>
Date: Tue Dec 9 10:36:39 2014 +0200
inline some strings, they don't need to be in a shared header file
Change-Id: I058489d207510024ce722c4d03f9aac628b120b5
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index bc43f65..1764861 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -22,10 +22,8 @@
namespace chart
{
-#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Cartesian" )
-#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.CartesianView" )
-#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Polar" )
-#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.PolarView" )
+#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME "com.sun.star.chart2.CoordinateSystems.CartesianView"
+#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME "com.sun.star.chart2.CoordinateSystems.PolarView"
} //namespace chart
#endif
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 34db0f2..c6ad005 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -36,6 +36,9 @@ static const char lcl_aServiceNameCartesian3d[] = "com.sun.star.chart2.Cartesian
static const char lcl_aImplementationNameCartesian2d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem2d";
static const char lcl_aImplementationNameCartesian3d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem3d";
+
+static const char CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Cartesian";
+
}
namespace chart
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 2ccf175..08bed1e 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -36,6 +36,9 @@ static const char lcl_aServiceNamePolar3d[] = "com.sun.star.chart2.PolarCoordina
static const char lcl_aImplementationNamePolar2d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem2d";
static const char lcl_aImplementationNamePolar3d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem3d";
+
+static const char CHART2_COOSYSTEM_POLAR_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Polar";
+
}
namespace chart
commit c227d963d8ea84445ef9617d30ac24092d33b92f
Author: Noel Grandin <noel at peralex.com>
Date: Tue Dec 9 08:30:11 2014 +0200
inline UNO helper macros
Change-Id: Ia401dd2f51108d2f3b08cd3d6d433a12ac17ee74
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 598c2b5..0b06d0b 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_INC_CHARTMODEL_HXX
#include "LifeTime.hxx"
-#include "ServiceMacros.hxx"
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XStorable2.hpp>
@@ -234,7 +233,15 @@ public:
// ::com::sun::star::lang::XServiceInfo
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 047192a..13bb252 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -21,7 +21,6 @@
#include "ChartModel.hxx"
#include "chartview/ExplicitValueProvider.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase10.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -116,7 +115,15 @@ public:
virtual ~ChartView();
// ___lang::XServiceInfo___
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ___lang::XInitialization___
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 4f0b6d7..4a1c94d 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -24,6 +24,7 @@
#include "WrappedDirectStateProperty.hxx"
#include <comphelper/InlineContainer.hxx>
#include <com/sun/star/drawing/FillStyle.hpp>
+#include <cppuhelper/supportsservice.hxx>
#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
@@ -179,7 +180,28 @@ Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( AreaWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL AreaWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString AreaWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index b65e2f8..5bca101 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_AREAWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -52,7 +51,15 @@ public:
virtual ~AreaWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XShape ____
virtual ::com::sun::star::awt::Point SAL_CALL getPosition()
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 10da0e7..0454cac 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -29,6 +29,7 @@
#include "DisposeHelper.hxx"
#include <unonames.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <comphelper/InlineContainer.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
@@ -694,7 +695,28 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( AxisWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL AxisWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString AxisWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index eb36310..4178c91 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -21,7 +21,6 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase5.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -68,7 +67,15 @@ public:
static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() SAL_OVERRIDE;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 2acabf8..1a7c0c2 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -28,6 +28,7 @@
#include "DataSeriesHelper.hxx"
#include "ControllerLockGuard.hxx"
#include "Chart2ModelContact.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
@@ -726,7 +727,28 @@ uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL ChartDataWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ChartDataWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 3822c26..23671fa 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX
-#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -55,7 +54,15 @@ public:
virtual ~ChartDataWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XDateCategories ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 695ecb1..e1a2299 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -47,6 +47,7 @@
#include "AreaWrapper.hxx"
#include "WrappedAddInProperty.hxx"
#include "WrappedIgnoreProperty.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
@@ -1566,7 +1567,28 @@ uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static(
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ChartDocumentWrapper, CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME );
+OUString SAL_CALL ChartDocumentWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ChartDocumentWrapper::getImplementationName_Static()
+{
+ return CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index dfd565e..b85a88d 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -46,6 +46,7 @@
#include <algorithm>
#include <comphelper/InlineContainer.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ChartAxisAssign.hpp>
#include <com/sun/star/chart/ChartErrorCategory.hpp>
@@ -881,7 +882,28 @@ uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DataSeriesPointWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL DataSeriesPointWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString DataSeriesPointWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index c0d128d..2206607 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DATASERIESPOINTWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DATASERIESPOINTWRAPPER_HXX
-#include "ServiceMacros.hxx"
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
#include <cppuhelper/implbase4.hxx>
@@ -74,7 +73,15 @@ public:
bool isLinesForbidden() { return !m_bLinesAllowed;}
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ___lang::XInitialization___
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 38ff60a..2962053 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -49,6 +49,7 @@
#include "WrappedAutomaticPositionProperties.hxx"
#include "CommonConverters.hxx"
#include <unonames.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
@@ -2081,7 +2082,28 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL DiagramWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString DiagramWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 7dcc16d..31b35ce 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DIAGRAMWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include "DiagramHelper.hxx"
#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
@@ -82,7 +81,15 @@ public:
virtual ~DiagramWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index e432ddc..b1a2ec4 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -30,6 +30,7 @@
#include "UserDefinedProperties.hxx"
#include "WrappedDefaultProperty.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
@@ -185,7 +186,28 @@ Sequence< OUString > GridWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( GridWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL GridWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString GridWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index bc0fe08..03af0e6 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_GRIDWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase2.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -62,7 +61,15 @@ public:
static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid );
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index cbb734b..7fcb53c 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -23,6 +23,7 @@
#include "LegendHelper.hxx"
#include "ContainerHelper.hxx"
#include <comphelper/InlineContainer.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart/ChartLegendPosition.hpp>
@@ -432,7 +433,28 @@ Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LegendWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL LegendWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString LegendWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 177be24..8f76007 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -21,7 +21,6 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -55,7 +54,15 @@ public:
virtual ~LegendWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() SAL_OVERRIDE;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 5455758..541ed9f 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -23,6 +23,7 @@
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
#include "ContainerHelper.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
@@ -418,7 +419,28 @@ Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( MinMaxLineWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL MinMaxLineWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString MinMaxLineWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index ddef4f4..3143222 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_MINMAXLINEWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_MINMAXLINEWRAPPER_HXX
-#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
#include "WrappedIgnoreProperty.hxx"
#include <cppuhelper/interfacecontainer.hxx>
@@ -60,7 +59,15 @@ public:
virtual ~MinMaxLineWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index aaa0c66..d6d2b43 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -23,6 +23,7 @@
#include "ControllerLockGuard.hxx"
#include <comphelper/InlineContainer.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
@@ -523,7 +524,28 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( TitleWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL TitleWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString TitleWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 71650f5..e8cf9e8 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -22,7 +22,6 @@
#include "WrappedPropertySet.hxx"
#include "ReferenceSizePropertyProvider.hxx"
#include "Chart2ModelContact.hxx"
-#include "ServiceMacros.hxx"
#include "TitleHelper.hxx"
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
@@ -54,7 +53,15 @@ public:
virtual ~TitleWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() SAL_OVERRIDE;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 57de5508..a5801ce 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -23,6 +23,7 @@
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
#include "ContainerHelper.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
@@ -382,7 +383,28 @@ Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( UpDownBarWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL UpDownBarWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString UpDownBarWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 9d6f0f0..314a8b9 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_UPDOWNBARWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_UPDOWNBARWRAPPER_HXX
-#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
#include <cppuhelper/interfacecontainer.hxx>
@@ -59,7 +58,15 @@ public:
virtual ~UpDownBarWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 58c629b..fac7b7a 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -21,6 +21,7 @@
#include "macros.hxx"
#include "Chart2ModelContact.hxx"
#include "ContainerHelper.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
@@ -166,7 +167,28 @@ Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( WallFloorWrapper, OUString(lcl_aServiceName) );
+OUString SAL_CALL WallFloorWrapper::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString WallFloorWrapper::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index f1896d8..58d43b2 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WALLFLOORWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase2.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -49,7 +48,15 @@ public:
virtual ~WallFloorWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index edf8d85..2834ba3 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -28,6 +28,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/msgbox.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <comphelper/servicehelper.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -60,10 +61,30 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
}
}
// lang::XServiceInfo
-APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME)
+OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString CreationWizardUnoDlg::getImplementationName_Static()
+{
+ return CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
- uno::Sequence< OUString > CreationWizardUnoDlg
-::getSupportedServiceNames_Static()
+uno::Sequence< OUString > CreationWizardUnoDlg::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_WIZARD_DIALOG_SERVICE_NAME;
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 84dc977..e54fefb 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -21,7 +21,6 @@
#include "AccessibleBase.hxx"
#include "MutexContainer.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 552f264..1c933d5 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CHARTDOCUMENTWRAPPER_HXX
#include "WrappedPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -65,7 +64,15 @@ public:
virtual ~ChartDocumentWrapper();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 9a00d96..b4ff5e8 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX
-#include "ServiceMacros.hxx"
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <vcl/vclevent.hxx>
#include <svtools/genericunodialog.hxx>
+
namespace chart
{
typedef ::svt::OGenericUnoDialog ChartTypeUnoDlg_BASE;
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index cc3b5d5..95d47fd 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_HXX
-#include "ServiceMacros.hxx"
#include "TimerTriggeredControllerLock.hxx"
#include "TabPageNotifiable.hxx"
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index fc97659..ce4f638 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_UNO_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_UNO_HXX
-#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
#include <cppuhelper/component.hxx>
#include <com/sun/star/awt/XWindow.hpp>
@@ -63,7 +62,15 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 7accfe9..a16a4ab 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -45,6 +45,7 @@
#include "UndoActions.hxx"
#include <comphelper/InlineContainer.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
@@ -302,7 +303,28 @@ bool ChartController::impl_isDisposedOrSuspended() const
// lang::XServiceInfo
-APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME)
+OUString SAL_CALL ChartController::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ChartController::getImplementationName_Static()
+{
+ return CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static()
{
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 5e4401a..81382ea 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTCONTROLLER_HXX
#include "LifeTime.hxx"
-#include "ServiceMacros.hxx"
#include "CommandDispatchContainer.hxx"
#include "SelectionHelper.hxx"
@@ -151,8 +150,15 @@ public:
virtual ~ChartController();
// ::com::sun::star::lang::XServiceInfo
-
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 567b150..fc574a2 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -22,6 +22,7 @@
#include "MediaDescriptorHelper.hxx"
#include "macros.hxx"
#include <unotools/mediadescriptor.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
@@ -56,10 +57,30 @@ ChartFrameLoader::~ChartFrameLoader()
// lang::XServiceInfo
-APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME)
+OUString SAL_CALL ChartFrameLoader::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ChartFrameLoader::getImplementationName_Static()
+{
+ return CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
- uno::Sequence< OUString > ChartFrameLoader
-::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME;
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 9941441..360f97e 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTFRAMELOADER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTFRAMELOADER_HXX
-#include "ServiceMacros.hxx"
#include <osl/conditn.hxx>
#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -53,8 +52,15 @@ public:
virtual ~ChartFrameLoader();
// ::com::sun::star::lang::XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- APPHELPER_XSERVICEINFO_DECL()
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 31073b1..ba5d165 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -27,6 +27,7 @@
#include "ResId.hxx"
#include "Strings.hrc"
+#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -246,7 +247,28 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, OUString(lcl_aServiceName) );
+OUString SAL_CALL ElementSelectorToolbarController::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ElementSelectorToolbarController::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
{
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index a27e29a..5c3a19d 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX
-#include "ServiceMacros.hxx"
#include "ObjectHierarchy.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -79,7 +78,15 @@ public:
virtual ~ElementSelectorToolbarController();
// XServiceInfo
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 3a98acd..8119695 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -25,7 +25,6 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
-#include "ServiceMacros.hxx"
// interfaces and types
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -91,7 +90,15 @@ public:
return (::cppu::OWeakObject *)new CachedDataSequence( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
/// merge XInterface implementations
DECLARE_XINTERFACE()
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index b70b824..993f7af 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX
#define INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX
-#include "ServiceMacros.hxx"
#include "ConfigItemListener.hxx"
#include "charttoolsdllapi.hxx"
#include <cppuhelper/implbase2.hxx>
@@ -61,7 +60,15 @@ public:
return (::cppu::OWeakObject *)new ConfigColorScheme( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XColorScheme ____
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index 539feda..6f55fec 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
-#include "ServiceMacros.hxx"
namespace chart
{
@@ -54,7 +53,15 @@ public:
return (::cppu::OWeakObject *)new DataSource( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XDataSource ____
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 2dace4f..c5ff30d 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_INC_ERRORBAR_HXX
#include "MutexContainer.hxx"
-#include "ServiceMacros.hxx"
#include "ModifyListenerHelper.hxx"
#include "charttoolsdllapi.hxx"
#include "LineProperties.hxx"
@@ -80,7 +79,16 @@ public:
virtual ~ErrorBar();
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
/// establish methods for factory instatiation
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index de8c751..38c922b 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX
#define INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/chart2/XCoordinateSystem.hpp>
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 045e948..3c6477c 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <cppuhelper/implbase7.hxx>
-#include "ServiceMacros.hxx"
#include "CachedDataSequence.hxx"
@@ -83,7 +82,15 @@ public:
void createDefaultData();
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 7868802..1e3f22e 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_CHART2_SOURCE_INC_LABELEDDATASEQUENCE_HXX
#define INCLUDED_CHART2_SOURCE_INC_LABELEDDATASEQUENCE_HXX
-#include "ServiceMacros.hxx"
+
#include "MutexContainer.hxx"
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -66,7 +66,15 @@ public:
return (::cppu::OWeakObject *)new LabeledDataSequence( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XLabeledDataSequence ____
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index fd968092..96a1e2a 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_CHART2_SOURCE_INC_SCALING_HXX
#define INCLUDED_CHART2_SOURCE_INC_SCALING_HXX
-#include "ServiceMacros.hxx"
+
#include <com/sun/star/chart2/XScaling.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
@@ -53,7 +53,15 @@ public:
return (::cppu::OWeakObject *)new LogarithmicScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
@@ -96,7 +104,15 @@ public:
return (::cppu::OWeakObject *)new ExponentialScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL
@@ -139,7 +155,15 @@ public:
return (::cppu::OWeakObject *)new LinearScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
@@ -181,7 +205,15 @@ public:
return (::cppu::OWeakObject *)new PowerScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
deleted file mode 100644
index 2fe5f96..0000000
--- a/chart2/source/inc/ServiceMacros.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_SERVICEMACROS_HXX
-#define INCLUDED_CHART2_SOURCE_INC_SERVICEMACROS_HXX
-
-#include <cppuhelper/supportsservice.hxx>
-
-/*
-to use these macros the supported services and the implementation name needs to be static
-especially you need to implement (declaration is contained in macro already):
-
-static com::sun::star::uno::Sequence< OUString >
- Class::getSupportedServiceNames_Static();
-*/
-
-// XServiceInfo decl
-
-namespace apphelper
-{
-
-#define APPHELPER_XSERVICEINFO_DECL() \
- virtual OUString SAL_CALL getImplementationName() \
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) \
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()\
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- \
- static OUString getImplementationName_Static(); \
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
-// XServiceInfo impl
-
-#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \
-OUString SAL_CALL Class::getImplementationName() \
- throw( css::uno::RuntimeException, std::exception ) \
-{ \
- return getImplementationName_Static(); \
-} \
- \
-OUString Class::getImplementationName_Static() \
-{ \
- return ImplName; \
-} \
- \
-sal_Bool SAL_CALL Class::supportsService( const OUString& rServiceName ) \
- throw( css::uno::RuntimeException, std::exception ) \
-{ \
- return cppu::supportsService(this, rServiceName); \
-} \
- \
-css::uno::Sequence< OUString > SAL_CALL Class::getSupportedServiceNames() \
- throw( css::uno::RuntimeException, std::exception ) \
-{ \
- return getSupportedServiceNames_Static(); \
-}
-
-}//end namespace apphelper
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index a87b798..f4ca955 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -25,7 +25,6 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
-#include "ServiceMacros.hxx"
#include "charttoolsdllapi.hxx"
// interfaces and types
@@ -94,7 +93,15 @@ public:
virtual ~UncachedDataSequence();
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
/// merge XInterface implementations
DECLARE_XINTERFACE()
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 0fd2cf4..480954e 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -27,6 +27,7 @@
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/documentconstants.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <sot/storage.hxx>
#include <osl/diagnose.h>
@@ -777,7 +778,28 @@ OUString XMLFilter::getMediaType(bool _bOasis)
return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART;
}
-APPHELPER_XSERVICEINFO_IMPL( XMLFilter, OUString("com.sun.star.comp.chart2.XMLFilter") );
+OUString SAL_CALL XMLFilter::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString XMLFilter::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart2.XMLFilter");
+}
+
+sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS )
{
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 121138d..ec6441e 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_BASECOORDINATESYSTEM_HXX
#define INCLUDED_CHART2_SOURCE_MODEL_INC_BASECOORDINATESYSTEM_HXX
-#include "ServiceMacros.hxx"
#include "OPropertySet.hxx"
#include "MutexContainer.hxx"
#include <cppuhelper/implbase6.hxx>
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index d547621..dc1de91 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_CARTESIANCOORDINATESYSTEM_HXX
#define INCLUDED_CHART2_SOURCE_MODEL_INC_CARTESIANCOORDINATESYSTEM_HXX
-#include "ServiceMacros.hxx"
#include "BaseCoordinateSystem.hxx"
namespace chart
@@ -48,7 +47,15 @@ public:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
@@ -66,7 +73,15 @@ public:
return (::cppu::OWeakObject *)new CartesianCoordinateSystem2d( xContext );
}
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
@@ -84,7 +99,15 @@ public:
return (::cppu::OWeakObject *)new CartesianCoordinateSystem3d( xContext );
}
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
} // namespace chart
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 6ea7172..c0be388 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -23,7 +23,6 @@
#include "MutexContainer.hxx"
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
-#include "ServiceMacros.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 0636de6..8940547 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -33,7 +33,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
// helper classes
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase8.hxx>
#include <comphelper/uno3.hxx>
#include <osl/mutex.hxx>
@@ -80,7 +79,15 @@ public:
return (::cppu::OWeakObject *)new DataSeries( xContext );
}
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
/// merge XInterface implementations
DECLARE_XINTERFACE()
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 8245df8..d1a17c3 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -35,8 +35,6 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-#include "ServiceMacros.hxx"
-
#include <map>
#include <vector>
@@ -75,7 +73,15 @@ public:
}
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
/// merge XInterface implementations
DECLARE_XINTERFACE()
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index af1bbce..decf8ba 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_POLARCOORDINATESYSTEM_HXX
#define INCLUDED_CHART2_SOURCE_MODEL_INC_POLARCOORDINATESYSTEM_HXX
-#include "ServiceMacros.hxx"
#include "BaseCoordinateSystem.hxx"
namespace chart
@@ -48,7 +47,15 @@ public:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class PolarCoordinateSystem2d : public PolarCoordinateSystem
@@ -66,7 +73,15 @@ public:
return (::cppu::OWeakObject *)new PolarCoordinateSystem2d( xContext );
}
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class PolarCoordinateSystem3d : public PolarCoordinateSystem
@@ -84,7 +99,15 @@ public:
return (::cppu::OWeakObject *)new PolarCoordinateSystem3d( xContext );
}
// ____ XServiceInfo ____
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
} // namespace chart
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index 65e465a1..c01b96d 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -25,7 +25,6 @@
#include "MutexContainer.hxx"
#include "OPropertySet.hxx"
-#include "ServiceMacros.hxx"
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index a091a0a..46118bd 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/xml/sax/XWriter.hpp>
#include <osl/mutex.hxx>
-#include "ServiceMacros.hxx"
namespace com { namespace sun { namespace star {
namespace embed
@@ -70,7 +69,15 @@ public:
return (::cppu::OWeakObject *)new XMLFilter( xContext );
}
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XFilter ____
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 06ae430..428e75a 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <rtl/uuid.h>
#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <vector>
#include <algorithm>
@@ -637,7 +638,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Axis, OUString(lcl_aServiceName) );
+OUString SAL_CALL Axis::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString Axis::getImplementationName_Static()
+{
+ return OUString(lcl_aServiceName);
+}
+
+sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace chart
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 609eced..faefe36 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -25,7 +25,6 @@
#include <cppuhelper/implbase6.hxx>
#include <comphelper/uno3.hxx>
-#include "ServiceMacros.hxx"
#include "ModifyListenerHelper.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
@@ -66,7 +65,15 @@ public:
return (::cppu::OWeakObject *)new Axis( xContext );
}
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
/// merge XInterface implementations
DECLARE_XINTERFACE()
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 2339be6..34db0f2 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -20,6 +20,7 @@
#include "CartesianCoordinateSystem.hxx"
#include "macros.hxx"
#include "servicenames_coosystems.hxx"
+#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star;
@@ -85,8 +86,28 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static(
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem,
- OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"))
+OUString SAL_CALL CartesianCoordinateSystem::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString CartesianCoordinateSystem::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem");
+}
+
+sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
// ==== CartesianCoordinateSystem2d ====
@@ -108,7 +129,28 @@ Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, OUString(lcl_aImplementationNameCartesian2d) )
+OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString CartesianCoordinateSystem2d::getImplementationName_Static()
+{
+ return OUString(lcl_aImplementationNameCartesian2d);
+}
+
+sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
// ==== CartesianCoordinateSystem3d ====
@@ -130,7 +172,28 @@ Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem3d, OUString(lcl_aImplementationNameCartesian3d) )
+OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString CartesianCoordinateSystem3d::getImplementationName_Static()
+{
+ return OUString(lcl_aImplementationNameCartesian3d);
+}
+
+sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 77354a9..4dddbdf 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -40,6 +40,7 @@
#include <comphelper/InlineContainer.hxx>
#include <comphelper/processfactory.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <svl/numuno.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -315,7 +316,28 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
// lang::XServiceInfo
-APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME)
+OUString SAL_CALL ChartModel::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString ChartModel::getImplementationName_Static()
+{
+ return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static()
{
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index dd0c6d8..7afc38c 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
@@ -296,7 +297,28 @@ using impl::DataPoint_Base;
IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DataPoint, OUString("com.sun.star.comp.chart.DataPoint") );
+OUString SAL_CALL DataPoint::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString DataPoint::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart.DataPoint") ;
+}
+
+sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace chart
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index ce0c89b..d7c8e6e 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -30,7 +30,6 @@
#include "OPropertySet.hxx"
#include "MutexContainer.hxx"
#include "ModifyListenerHelper.hxx"
-#include "ServiceMacros.hxx"
namespace chart
{
@@ -59,7 +58,15 @@ public:
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
explicit DataPoint( const DataPoint & rOther );
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 3189100..393c279 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -29,6 +29,7 @@
#include "CloneHelper.hxx"
#include "ModifyListenerHelper.hxx"
#include "EventListenerHelper.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
@@ -576,8 +577,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataSeries, DataSeries_Base, OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DataSeries,
- OUString("com.sun.star.comp.chart.DataSeries") );
+OUString SAL_CALL DataSeries::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString DataSeries::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart.DataSeries");
+}
+
+sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace chart
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index b96c1ac..a016570 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/drawing/CameraGeometry.hpp>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
+#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
#include <iterator>
@@ -745,8 +746,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( Diagram, Diagram_Base, ::property::OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Diagram,
- OUString("com.sun.star.comp.chart2.Diagram") );
+OUString SAL_CALL Diagram::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString Diagram::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart2.Diagram");
+}
+
+sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getSupportedServiceNames_Static();
+}
} // namespace chart
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 21e0a9d..8ecfb02 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -24,6 +24,7 @@
#include "PropertyHelper.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star;
@@ -240,8 +241,28 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope
// do this in derived classes!
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( FormattedString,
- OUString("com.sun.star.comp.chart.FormattedString") );
+OUString SAL_CALL FormattedString::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return getImplementationName_Static();
+}
+
+OUString FormattedString::getImplementationName_Static()
+{
+ return OUString("com.sun.star.comp.chart.FormattedString");
+}
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list