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 /include/vcl/txtattr.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 'include/vcl/txtattr.hxx')
-rw-r--r-- | include/vcl/txtattr.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index ee6862ced477..cab94b248e0b 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -67,7 +67,7 @@ private: public: TextAttribFontColor( const Color& rColor ); TextAttribFontColor( const TextAttribFontColor& rAttr ); - virtual ~TextAttribFontColor(); + virtual ~TextAttribFontColor() override; const Color& GetColor() const { return maColor; } @@ -85,7 +85,7 @@ private: public: TextAttribFontWeight( FontWeight eWeight ); TextAttribFontWeight( const TextAttribFontWeight& rAttr ); - virtual ~TextAttribFontWeight(); + virtual ~TextAttribFontWeight() override; virtual void SetFont( vcl::Font& rFont ) const override; virtual TextAttrib* Clone() const override; @@ -104,7 +104,7 @@ private: public: TextAttribHyperLink( const TextAttribHyperLink& rAttr ); - virtual ~TextAttribHyperLink(); + virtual ~TextAttribHyperLink() override; const OUString& GetURL() const { return maURL; } virtual void SetFont( vcl::Font& rFont ) const override; @@ -117,7 +117,7 @@ class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib public: TextAttribProtect(); TextAttribProtect( const TextAttribProtect& rAttr ); - virtual ~TextAttribProtect(); + virtual ~TextAttribProtect() override; virtual void SetFont( vcl::Font& rFont ) const override; virtual TextAttrib* Clone() const override; |