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/drawinglayer/primitive3d | |
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/drawinglayer/primitive3d')
3 files changed, 3 insertions, 3 deletions
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 5326d58a3252..ef75d4e808e1 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -101,7 +101,7 @@ namespace drawinglayer public: // constructor/destructor BasePrimitive3D(); - virtual ~BasePrimitive3D(); + virtual ~BasePrimitive3D() override; /** the ==operator is mainly needed to allow testing newly-created high level primitives against their last incarnation which buffers/holds the decompositions. The default implementation diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index fc4e7bc9ede9..5e67ffe45d0e 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -90,7 +90,7 @@ namespace drawinglayer bool bCharacterMode, bool bCloseFront, bool bCloseBack); - virtual ~SdrExtrudePrimitive3D(); + virtual ~SdrExtrudePrimitive3D() override; /// data read access const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; } diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 3da2ac367e19..d4fabef127b4 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -94,7 +94,7 @@ namespace drawinglayer bool bCharacterMode, bool bCloseFront, bool bCloseBack); - virtual ~SdrLathePrimitive3D(); + virtual ~SdrLathePrimitive3D() override; /// data read access const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; } |