From 1d8f8c55f841bee0fdf0aee4ac15b023aadbb78e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Mar 2014 12:24:47 +0100 Subject: Missing XServiceInfo base class Change-Id: Ib629a60d626c10ac9628d172896790e90d2daf51 --- chart2/source/model/template/AreaChartType.hxx | 7 +++---- chart2/source/model/template/BarChartType.hxx | 7 +++---- chart2/source/model/template/BubbleChartType.hxx | 7 +++---- chart2/source/model/template/CandleStickChartType.hxx | 7 +++---- chart2/source/model/template/ChartType.hxx | 5 +++-- chart2/source/model/template/ColumnChartType.hxx | 7 +++---- chart2/source/model/template/FilledNetChartType.hxx | 7 +++---- chart2/source/model/template/GL3DBarChartType.hxx | 7 +++---- chart2/source/model/template/LineChartType.hxx | 7 +++---- chart2/source/model/template/NetChartType.hxx | 7 +++---- chart2/source/model/template/PieChartType.hxx | 7 +++---- chart2/source/model/template/ScatterChartType.hxx | 7 +++---- 12 files changed, 36 insertions(+), 46 deletions(-) (limited to 'chart2/source/model') diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 7ba638d61f2a..bb7417575b70 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -33,16 +33,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~AreaChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 0f7496b8350d..71d0dad30833 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -33,16 +33,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~BarChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 8ea10d536c79..a74533b98ba4 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -34,16 +34,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~BubbleChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index b22e443e1da2..6f00058e954e 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -33,16 +33,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~CandleStickChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 76f5595b55ae..82eb80332504 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -21,7 +21,7 @@ #include "MutexContainer.hxx" #include "OPropertySet.hxx" -#include +#include #include #include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" @@ -38,7 +38,8 @@ namespace chart namespace impl { -typedef ::cppu::WeakImplHelper5< +typedef ::cppu::WeakImplHelper6< + css::lang::XServiceInfo, ::com::sun::star::chart2::XChartType, ::com::sun::star::chart2::XDataSeriesContainer, ::com::sun::star::util::XCloneable, diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index eb14206e9cb7..a5287d966908 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -33,16 +33,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~ColumnChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index d23aa9e161c6..6690f5d78f9a 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -32,16 +32,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~FilledNetChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 8c37009e3338..aa5ab6b52de4 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -25,16 +25,15 @@ public: GL3DBarChartType( const css::uno::Reference& xContext ); virtual ~GL3DBarChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index ca7ac9def0ad..28d25ab98d5b 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -34,16 +34,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~LineChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 1c90bc179d0c..aaf548ee7eb5 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -60,16 +60,15 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~NetChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 6c350fd85e60..575bfff47130 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -34,16 +34,15 @@ public: sal_Bool bUseRings = sal_False ); virtual ~PieChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 91d29f075f9e..d5be8d0378bc 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -38,16 +38,15 @@ public: sal_Int32 nOrder = 3 ); virtual ~ScatterChartType(); - //TODO: are these actually used (given they are not SAL_OVERRIDE)? virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); -- cgit