diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /chart2/source/model | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'chart2/source/model')
44 files changed, 49 insertions, 49 deletions
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index da9a04c128d2..ab73022b468b 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -58,7 +58,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2 ); explicit BaseCoordinateSystem( const BaseCoordinateSystem & rSource ); - virtual ~BaseCoordinateSystem(); + virtual ~BaseCoordinateSystem() override; // ____ OPropertySet ____ virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index d17126c9b9e0..5cd12965bd36 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -31,7 +31,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2 ); explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource ); - virtual ~CartesianCoordinateSystem(); + virtual ~CartesianCoordinateSystem() override; // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() @@ -60,7 +60,7 @@ class CartesianCoordinateSystem2d : public CartesianCoordinateSystem public: explicit CartesianCoordinateSystem2d( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~CartesianCoordinateSystem2d(); + virtual ~CartesianCoordinateSystem2d() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() @@ -80,7 +80,7 @@ public: explicit CartesianCoordinateSystem3d( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~CartesianCoordinateSystem3d(); + virtual ~CartesianCoordinateSystem3d() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 807ce952d3c5..b41664120019 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -41,7 +41,7 @@ class ChartTypeManager : public: explicit ChartTypeManager( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~ChartTypeManager(); + virtual ~ChartTypeManager() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 81859e6186ab..030d0ce3c219 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -68,7 +68,7 @@ class DataSeries : { public: explicit DataSeries( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~DataSeries(); + virtual ~DataSeries() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 6e86d36464d5..9dbec671422c 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -62,7 +62,7 @@ class Diagram : { public: Diagram( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~Diagram(); + virtual ~Diagram() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index ba4def86ec79..70773f03153e 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -31,7 +31,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2 ); explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource ); - virtual ~PolarCoordinateSystem(); + virtual ~PolarCoordinateSystem() override; // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() @@ -60,7 +60,7 @@ class PolarCoordinateSystem2d : public PolarCoordinateSystem public: explicit PolarCoordinateSystem2d( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~PolarCoordinateSystem2d(); + virtual ~PolarCoordinateSystem2d() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() @@ -79,7 +79,7 @@ class PolarCoordinateSystem3d : public PolarCoordinateSystem public: explicit PolarCoordinateSystem3d( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~PolarCoordinateSystem3d(); + virtual ~PolarCoordinateSystem3d() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index a00419aa2eab..51d3db993fb5 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -47,7 +47,7 @@ class StockBar : { public: explicit StockBar( bool bRisingCourse ); - virtual ~StockBar(); + virtual ~StockBar() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index ffe01fc40e7c..1c7ce84131ad 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -59,7 +59,7 @@ class XMLFilter : public { public: explicit XMLFilter( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~XMLFilter(); + virtual ~XMLFilter() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index bc6bc659c02d..00f0d6503b19 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -55,7 +55,7 @@ class Axis : { public: explicit Axis( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~Axis(); + virtual ~Axis() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 2be2e69053dc..2262079f0e59 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -52,7 +52,7 @@ class DataPoint : { public: explicit DataPoint( const css::uno::Reference< css::beans::XPropertySet > & rParentProperties ); - virtual ~DataPoint(); + virtual ~DataPoint() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 54e714748ade..8f4755405260 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -51,7 +51,7 @@ class FormattedString : public: explicit FormattedString( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~FormattedString(); + virtual ~FormattedString() override; /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index ae73f6160aa8..75dd9a33ce1a 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -53,7 +53,7 @@ class GridProperties : public: explicit GridProperties( css::uno::Reference< css::uno::XComponentContext > const & xContext ); explicit GridProperties(); - virtual ~GridProperties(); + virtual ~GridProperties() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index d3a761541655..066a595b3606 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -52,7 +52,7 @@ class Legend : { public: explicit Legend( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~Legend(); + virtual ~Legend() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index b89cb9a3f918..721642059028 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -49,7 +49,7 @@ class PageBackground : { public: explicit PageBackground( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~PageBackground(); + virtual ~PageBackground() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index c741da577f13..b484ccec66cf 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -50,7 +50,7 @@ class Title : { public: explicit Title( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~Title(); + virtual ~Title() override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 00d09d8a926b..e35d936312b7 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -49,7 +49,7 @@ class Wall : { public: Wall(); - virtual ~Wall(); + virtual ~Wall() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index d3afb47a6bff..b3c2843197eb 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -28,7 +28,7 @@ class AreaChartType : public ChartType { public: explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~AreaChartType(); + virtual ~AreaChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 9a65af2d3912..83d73c1687e6 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -40,7 +40,7 @@ public: const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim = 2 ); - virtual ~AreaChartTypeTemplate(); + virtual ~AreaChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index eb6344d36733..96b706e41999 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -28,7 +28,7 @@ class BarChartType : public ChartType { public: explicit BarChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~BarChartType(); + virtual ~BarChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 5c1dc3724cd1..73b98fa1fe56 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -47,7 +47,7 @@ public: StackMode eStackMode, BarDirection eDirection, sal_Int32 nDim = 2 ); - virtual ~BarChartTypeTemplate(); + virtual ~BarChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 3e2f69e4e5c4..66d7508b00ae 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -30,7 +30,7 @@ class BubbleChartType : public ChartType public: explicit BubbleChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~BubbleChartType(); + virtual ~BubbleChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index b6ede1c10b66..e5e135726f5f 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -36,7 +36,7 @@ public: explicit BubbleChartTypeTemplate( css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName ); - virtual ~BubbleChartTypeTemplate(); + virtual ~BubbleChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index ed5cebfcc0e8..4f08d05c7517 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -29,7 +29,7 @@ class BubbleDataInterpreter : public DataInterpreter public: explicit BubbleDataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~BubbleDataInterpreter(); + virtual ~BubbleDataInterpreter() override; protected: // ____ XDataInterpreter ____ diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 6521ca2b9cb1..a4079f2b86fd 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -29,7 +29,7 @@ class CandleStickChartType : public ChartType public: explicit CandleStickChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~CandleStickChartType(); + virtual ~CandleStickChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 653ce0f2ee1c..ef702bc71e46 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -54,7 +54,7 @@ class ChartType : { public: explicit ChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~ChartType(); + virtual ~ChartType() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 2f7bdcb26b41..3ae8a9a9a91c 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -76,7 +76,7 @@ class ChartTypeTemplate : public ::cppu::WeakImplHelper< public: explicit ChartTypeTemplate( css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName ); - virtual ~ChartTypeTemplate(); + virtual ~ChartTypeTemplate() override; protected: // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 6da6f794194c..3616a28ddece 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -28,7 +28,7 @@ class ColumnChartType : public ChartType { public: explicit ColumnChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~ColumnChartType(); + virtual ~ColumnChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 7cb7d76e41d5..80a15444d598 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -40,7 +40,7 @@ public: const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ); - virtual ~ColumnLineChartTypeTemplate(); + virtual ~ColumnLineChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 8c0505236fa2..ea7ef0a934cd 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -30,7 +30,7 @@ public: explicit ColumnLineDataInterpreter( sal_Int32 nNumberOfLines, const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~ColumnLineDataInterpreter(); + virtual ~ColumnLineDataInterpreter() override; protected: // ____ XDataInterpreter ____ diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index e9fd3e3ec042..8815496681fb 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -33,7 +33,7 @@ class DataInterpreter : public ::cppu::WeakImplHelper< { public: explicit DataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~DataInterpreter(); + virtual ~DataInterpreter() override; const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() const { return m_xContext;} diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index f16f51877405..d7ddbaa9f790 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -28,7 +28,7 @@ class FilledNetChartType : public NetChartType_Base { public: explicit FilledNetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~FilledNetChartType(); + virtual ~FilledNetChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 7540e41290b3..dc2680871c72 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -22,7 +22,7 @@ class GL3DBarChartType : public ChartType { public: explicit GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); - virtual ~GL3DBarChartType(); + virtual ~GL3DBarChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index 220b1e534703..baa781459d1a 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -30,7 +30,7 @@ public: css::uno::XComponentContext>& xContext, const OUString& rServiceName ); - virtual ~GL3DBarChartTypeTemplate(); + virtual ~GL3DBarChartTypeTemplate() override; virtual css::uno::Reference<css::chart2::XChartType> getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 8602ef32b63d..17190dd59084 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -29,7 +29,7 @@ class LineChartType : public ChartType { public: explicit LineChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~LineChartType(); + virtual ~LineChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index c8d1ad21c9b8..1a1364bfb8f2 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -42,7 +42,7 @@ public: bool bSymbols, bool bHasLines = true, sal_Int32 nDim = 2 ); - virtual ~LineChartTypeTemplate(); + virtual ~LineChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 5ea718208b64..ea931ea702df 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -28,7 +28,7 @@ class NetChartType_Base : public ChartType { public: explicit NetChartType_Base( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~NetChartType_Base(); + virtual ~NetChartType_Base() override; protected: explicit NetChartType_Base( const NetChartType_Base & rOther ); @@ -55,7 +55,7 @@ class NetChartType : public NetChartType_Base { public: explicit NetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~NetChartType(); + virtual ~NetChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index cefc496a10b2..f6eca07f400b 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -36,7 +36,7 @@ public: bool bHasLines = true, bool bHasFilledArea = false ); - virtual ~NetChartTypeTemplate(); + virtual ~NetChartTypeTemplate() override; protected: // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 34b3b306a8b5..19aa8f2050b0 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -29,7 +29,7 @@ class PieChartType : public ChartType public: explicit PieChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~PieChartType(); + virtual ~PieChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index e9f191fe3af7..5940ba610b2a 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -41,7 +41,7 @@ public: css::chart2::PieChartOffsetMode eMode, bool bRings = false, sal_Int32 nDim = 2 ); - virtual ~PieChartTypeTemplate(); + virtual ~PieChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index b3ef17dd89de..117364065550 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -33,7 +33,7 @@ public: css::chart2::CurveStyle eCurveStyle = css::chart2::CurveStyle_LINES, sal_Int32 nResolution = 20, sal_Int32 nOrder = 3 ); - virtual ~ScatterChartType(); + virtual ~ScatterChartType() override; virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 6a03fe38dff3..65ae965bc284 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -40,7 +40,7 @@ public: bool bSymbols, bool bHasLines = true, sal_Int32 nDim = 2 ); - virtual ~ScatterChartTypeTemplate(); + virtual ~ScatterChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 89e4295ec31b..2a04ba2bec6a 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -54,7 +54,7 @@ public: const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ); - virtual ~StockChartTypeTemplate(); + virtual ~StockChartTypeTemplate() override; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index 5b466f892c26..9e054af878db 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -32,7 +32,7 @@ public: explicit StockDataInterpreter( StockChartTypeTemplate::StockVariant eVariant, const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~StockDataInterpreter(); + virtual ~StockDataInterpreter() override; protected: // ____ XDataInterpreter ____ diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index 08ab0fb79d0c..cf8017a02a3c 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -28,7 +28,7 @@ class XYDataInterpreter : public DataInterpreter { public: explicit XYDataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~XYDataInterpreter(); + virtual ~XYDataInterpreter() override; protected: // ____ XDataInterpreter ____ |