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/inc | |
| 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/inc')
| -rw-r--r-- | chart2/inc/ChartModel.hxx | 2 | ||||
| -rw-r--r-- | chart2/inc/ChartView.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 92c6c05d5c5f..f6c556c1332a 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -216,7 +216,7 @@ public: ChartModel() = delete; ChartModel(css::uno::Reference< css::uno::XComponentContext > const & xContext); explicit ChartModel( const ChartModel & rOther ); - virtual ~ChartModel(); + virtual ~ChartModel() override; // css::lang::XServiceInfo diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 7fadb39291ca..f4170353d83e 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -110,7 +110,7 @@ public: ChartView(css::uno::Reference< css::uno::XComponentContext > const & xContext, ChartModel& rModel); - virtual ~ChartView(); + virtual ~ChartView() override; // ___lang::XServiceInfo___ virtual OUString SAL_CALL getImplementationName() |