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/svx/svdhdl.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/svx/svdhdl.hxx')
-rw-r--r-- | include/svx/svdhdl.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 399a009b3ea7..43fc5568ee0c 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -265,7 +265,7 @@ private: public: explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false); - virtual ~SdrHdlColor(); + virtual ~SdrHdlColor() override; bool IsUseLuminance() const { return bUseLuminance; } @@ -300,7 +300,7 @@ private: public: SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad = true); - virtual ~SdrHdlGradient(); + virtual ~SdrHdlGradient() override; bool IsGradient() const { return bGradient; } @@ -338,7 +338,7 @@ protected: public: SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind=SdrHdlKind::MirrorAxis) { eKind=eNewKind; pHdl1=&rHdl1; pHdl2=&rHdl2; } - virtual ~SdrHdlLine(); + virtual ~SdrHdlLine() override; virtual Pointer GetPointer() const override; }; @@ -357,7 +357,7 @@ protected: public: // this is not a Copy-Ctor!!! SdrHdlBezWgt(const SdrHdl* pRefHdl1, SdrHdlKind eNewKind=SdrHdlKind::BezierWeight) { eKind=eNewKind; pHdl1=pRefHdl1; } - virtual ~SdrHdlBezWgt(); + virtual ~SdrHdlBezWgt() override; }; @@ -382,7 +382,7 @@ class ImpEdgeHdl: public SdrHdl public: ImpEdgeHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind),eLineCode(SdrEdgeLineCode::MiddleLine) {} - virtual ~ImpEdgeHdl(); + virtual ~ImpEdgeHdl() override; void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } @@ -398,7 +398,7 @@ class ImpMeasureHdl: public SdrHdl public: ImpMeasureHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind) {} - virtual ~ImpMeasureHdl(); + virtual ~ImpMeasureHdl() override; virtual Pointer GetPointer() const override; }; |