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 /writerperfect/source | |
| 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 'writerperfect/source')
| -rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.hxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index e4c88001c006..a56ffcc8b63c 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -22,7 +22,7 @@ class KeynoteImportFilter : public writerperfect::ImportFilter<OdpGenerator> public: explicit KeynoteImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext) : writerperfect::ImportFilter<OdpGenerator>(rxContext) {} - virtual ~KeynoteImportFilter() {} + virtual ~KeynoteImportFilter() override {} //XExtendedFilterDetection virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index 7ebdf2633bd3..a8c30dfa6f41 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -45,7 +45,7 @@ protected: public: explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext) : mxContext(rxContext) {} - virtual ~WordPerfectImportFilter() {} + virtual ~WordPerfectImportFilter() override {} // XFilter virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) |