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/tools | |
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/tools')
-rw-r--r-- | chart2/source/tools/ConfigColorScheme.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ExplicitCategoriesProvider.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/InternalDataProvider.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/RegressionCurveModel.hxx | 16 | ||||
-rw-r--r-- | chart2/source/tools/RegressionEquation.hxx | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 6ecd3f3836fa..21b54d5a365f 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -53,7 +53,7 @@ class ChartConfigItem : public ::utl::ConfigItem { public: explicit ChartConfigItem( ConfigColorScheme & rListener ); - virtual ~ChartConfigItem() {} + virtual ~ChartConfigItem() override {} void addPropertyNotification( const OUString & rPropertyName ); uno::Any getProperty( const OUString & aPropertyName ); diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index d2f24524873b..70321070d3bf 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -226,7 +226,7 @@ public: : m_rSplitCategoriesList( rSplitCategoriesList ) , mrModel( rModel ) {} - virtual ~SplitCategoriesProvider_ForLabeledDataSequences() + virtual ~SplitCategoriesProvider_ForLabeledDataSequences() override {} virtual sal_Int32 getLevelCount() const override; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index eaab5476c67d..32dd3c715ab2 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1355,7 +1355,7 @@ public: explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< uno::Any > >& rComplexDescriptions ) : m_rComplexDescriptions( rComplexDescriptions ) {} - virtual ~SplitCategoriesProvider_ForComplexDescriptions() + virtual ~SplitCategoriesProvider_ForComplexDescriptions() override {} virtual sal_Int32 getLevelCount() const override; diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 35e63007d6d0..5f56f766b672 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -68,7 +68,7 @@ public: RegressionCurveModel( css::uno::Reference< css::uno::XComponentContext > const & xContext, tCurveType eCurveType ); RegressionCurveModel( const RegressionCurveModel & rOther ); - virtual ~RegressionCurveModel(); + virtual ~RegressionCurveModel() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -145,7 +145,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit MeanValueRegressionCurve( const MeanValueRegressionCurve & rOther ); - virtual ~MeanValueRegressionCurve(); + virtual ~MeanValueRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -171,7 +171,7 @@ public: css::uno::XComponentContext > & xContext ); explicit LinearRegressionCurve( const LinearRegressionCurve & rOther ); - virtual ~LinearRegressionCurve(); + virtual ~LinearRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -197,7 +197,7 @@ public: css::uno::XComponentContext > & xContext ); explicit LogarithmicRegressionCurve( const LogarithmicRegressionCurve & rOther ); - virtual ~LogarithmicRegressionCurve(); + virtual ~LogarithmicRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -222,7 +222,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit ExponentialRegressionCurve( const ExponentialRegressionCurve & rOther ); - virtual ~ExponentialRegressionCurve(); + virtual ~ExponentialRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -248,7 +248,7 @@ public: css::uno::XComponentContext > & xContext ); explicit PotentialRegressionCurve( const PotentialRegressionCurve & rOther ); - virtual ~PotentialRegressionCurve(); + virtual ~PotentialRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -273,7 +273,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit PolynomialRegressionCurve( const PolynomialRegressionCurve & rOther ); - virtual ~PolynomialRegressionCurve(); + virtual ~PolynomialRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() @@ -298,7 +298,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit MovingAverageRegressionCurve( const MovingAverageRegressionCurve & rOther ); - virtual ~MovingAverageRegressionCurve(); + virtual ~MovingAverageRegressionCurve() override; // ____ XCloneable ____ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index b05aa1f4ac94..cd2d4456843a 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -54,7 +54,7 @@ class RegressionEquation : { public: explicit RegressionEquation(); - virtual ~RegressionEquation(); + virtual ~RegressionEquation() override; virtual OUString SAL_CALL getImplementationName() |