diff options
Diffstat (limited to 'chart2/source/model/template')
28 files changed, 309 insertions, 41 deletions
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index c739d1c3f351..7f16f17c7c02 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -20,6 +20,7 @@ #include "AreaChartType.hxx" #include "macros.hxx" #include "servicenames_charttypes.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -61,8 +62,28 @@ uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( AreaChartType, - OUString("com.sun.star.comp.chart.AreaChartType") ); +OUString SAL_CALL AreaChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString AreaChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.AreaChartType"); +} + +sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index afb255fb3bbc..21d17a3d2ac5 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_AREACHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 00c0e53a6f8d..87823c84c352 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -20,6 +20,7 @@ #include "BarChartType.hxx" #include "macros.hxx" #include "servicenames_charttypes.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -72,8 +73,28 @@ uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( BarChartType, - OUString("com.sun.star.comp.chart.BarChartType") ); +OUString SAL_CALL BarChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString BarChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.BarChartType"); +} + +sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 48962e5da1a4..5000022475dd 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_BARCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 42ce1be61ab1..a2f754908caf 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -223,8 +224,28 @@ uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( BubbleChartType, - OUString("com.sun.star.comp.chart.BubbleChartType") ); +OUString SAL_CALL BubbleChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString BubbleChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.BubbleChartType"); +} + +sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index c588a412e832..0e8456b75183 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_BUBBLECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index faf5f39627eb..eb18c8038010 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -24,6 +24,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -336,8 +337,28 @@ uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static( } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CandleStickChartType, - OUString("com.sun.star.comp.chart.CandleStickChartType") ); +OUString SAL_CALL CandleStickChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CandleStickChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.CandleStickChartType") ; +} + +sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 3b205cf4bf4c..7a5ade0bfc06 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CANDLESTICKCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 7facd15af85e..8b0670a9055c 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -23,7 +23,6 @@ #include "OPropertySet.hxx" #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/XChartType.hpp> diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index f6ebbee5e483..7c68a5908438 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -35,6 +35,7 @@ #include "BubbleChartTypeTemplate.hxx" #include "GL3DBarChartTypeTemplate.hxx" #include <cppuhelper/component_context.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/InlineContainer.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -612,8 +613,29 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager, - OUString("com.sun.star.comp.chart.ChartTypeManager") ); +OUString SAL_CALL ChartTypeManager::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartTypeManager::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ChartTypeManager"); +} + +sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} + } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index fb9e0a19c23e..d37e870f16fe 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CHARTTYPETEMPLATE_HXX #include <cppuhelper/implbase2.hxx> -#include "ServiceMacros.hxx" #include "DataInterpreter.hxx" #include "StackMode.hxx" #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 4357b6a995fd..eb1f1c2ad59a 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -23,6 +23,7 @@ #include "PropertyHelper.hxx" #include "ContainerHelper.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; @@ -194,8 +195,28 @@ uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ColumnChartType, - OUString("com.sun.star.comp.chart.ColumnChartType") ); +OUString SAL_CALL ColumnChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ColumnChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ColumnChartType"); +} + +sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index beb9ca32f33e..1f35e279ccc1 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_COLUMNCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 621bf1beab6e..5db7d6655344 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -26,6 +26,7 @@ #include "ContainerHelper.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> +#include <cppuhelper/supportsservice.hxx> #include <vector> #include <algorithm> @@ -388,7 +389,28 @@ Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, OUString("com.sun.star.comp.chart2.DataInterpreter") ); +OUString SAL_CALL DataInterpreter::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataInterpreter::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.DataInterpreter"); +} + +sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index af589f13bf63..7c2cd4a191c2 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX -#include "ServiceMacros.hxx" #include <cppuhelper/implbase2.hxx> #include <com/sun/star/chart2/XDataInterpreter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +40,15 @@ public: GetComponentContext() const { return m_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(); // convenience methods static OUString GetRole( diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 1b8381c87c46..35d57e2f5d00 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -27,6 +27,7 @@ #include "AxisIndexDefines.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -77,8 +78,28 @@ uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( FilledNetChartType, - OUString("com.sun.star.comp.chart.FilledNetChartType") ); +OUString SAL_CALL FilledNetChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString FilledNetChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.FilledNetChartType"); +} + +sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 9d3eae614883..65ce78fbd6d3 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_FILLEDNETCHARTTYPE_HXX #include "NetChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index e99fe390c871..f22e29d59074 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -11,6 +11,7 @@ #include <servicenames_charttypes.hxx> #include <PropertyHelper.hxx> #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -100,8 +101,28 @@ GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) : GL3DBarChartType::~GL3DBarChartType() {} -APPHELPER_XSERVICEINFO_IMPL( - GL3DBarChartType, OUString("com.sun.star.comp.chart.GL3DBarChartType") ); +OUString SAL_CALL GL3DBarChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString GL3DBarChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.GL3DBarChartType"); +} + +sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Sequence<OUString> GL3DBarChartType::getSupportedServiceNames_Static() { diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 91b471414c44..3ea07b82da6d 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -11,7 +11,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index 6acd53e960ff..e5fe1b9924ee 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -13,7 +13,6 @@ #include <MutexContainer.hxx> #include <ChartTypeTemplate.hxx> #include <OPropertySet.hxx> -#include <ServiceMacros.hxx> #include <comphelper/uno3.hxx> diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index c55f6c8ce389..131a39a46cb1 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -23,6 +23,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> @@ -199,8 +200,28 @@ uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LineChartType, - OUString("com.sun.star.comp.chart.LineChartType") ); +OUString SAL_CALL LineChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LineChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.LineChartType"); +} + +sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index e6dc000cf601..1628947cf680 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_LINECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ab94fe3b018a..28bf2a5a2638 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -26,6 +26,7 @@ #include "AxisIndexDefines.hxx" #include "AxisHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -181,8 +182,28 @@ uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( NetChartType, - OUString("com.sun.star.comp.chart.NetChartType") ); +OUString SAL_CALL NetChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString NetChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.NetChartType"); +} + +sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index b6d446f0569e..32152edbd9f1 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_NETCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 841bf5a6ce28..1fff9a05b8c4 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -25,6 +25,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include "AxisIndexDefines.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -239,8 +240,28 @@ uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PieChartType, - OUString("com.sun.star.comp.chart.PieChartType") ); +OUString SAL_CALL PieChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PieChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.PieChartType"); +} + +sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 9ee809f31e9a..c905852b840c 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_PIECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 6d3fb904c0fd..937195966783 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -26,6 +26,7 @@ #include "AxisHelper.hxx" #include "AxisIndexDefines.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -259,8 +260,28 @@ uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ScatterChartType, - OUString("com.sun.star.comp.chart.ScatterChartType") ); +OUString SAL_CALL ScatterChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ScatterChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ScatterChartType"); +} + +sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 8eb63a187cba..777afe0ff89c 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_SCATTERCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart |