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 /sc/inc/editsrc.hxx | |
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 'sc/inc/editsrc.hxx')
-rw-r--r-- | sc/inc/editsrc.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index f992490aef0e..8ef58b768f0d 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -54,7 +54,7 @@ private: public: ScHeaderFooterEditSource(ScHeaderFooterTextData& rData); - virtual ~ScHeaderFooterEditSource(); + virtual ~ScHeaderFooterEditSource() override; // GetEditEngine is needed because the forwarder doesn't have field functions virtual ScEditEngineDefaulter* GetEditEngine() override; @@ -78,7 +78,7 @@ private: public: ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellEditSource(); + virtual ~ScCellEditSource() override; // GetEditEngine is needed because the forwarder doesn't have field functions virtual ScEditEngineDefaulter* GetEditEngine() override; @@ -104,7 +104,7 @@ private: SdrObject* GetCaptionObj(); public: ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScAnnotationEditSource(); + virtual ~ScAnnotationEditSource() override; virtual SvxEditSource* Clone() const override ; virtual SvxTextForwarder* GetTextForwarder() override; @@ -122,7 +122,7 @@ private: public: ScSimpleEditSource( SvxTextForwarder* pForw ); - virtual ~ScSimpleEditSource(); + virtual ~ScSimpleEditSource() override; virtual SvxEditSource* Clone() const override ; virtual SvxTextForwarder* GetTextForwarder() override; @@ -137,7 +137,7 @@ private: public: ScAccessibilityEditSource( ::std::unique_ptr < ScAccessibleTextData > && pAccessibleCellTextData ); - virtual ~ScAccessibilityEditSource(); + virtual ~ScAccessibilityEditSource() override; virtual SvxEditSource* Clone() const override; virtual SvxTextForwarder* GetTextForwarder() override; |