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/svddrgmt.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/svddrgmt.hxx')
-rw-r--r-- | include/svx/svddrgmt.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index ab6bb5c59bc9..3eefaa79bec1 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -54,7 +54,7 @@ private: public: SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon); - virtual ~SdrDragEntryPolyPolygon(); + virtual ~SdrDragEntryPolyPolygon() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -70,7 +70,7 @@ private: public: SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify); - virtual ~SdrDragEntrySdrObject(); + virtual ~SdrDragEntrySdrObject() override; // #i54102# Split createPrimitive2DSequenceInCurrentState in prepareCurrentState and processing, // added accessors to original and clone @@ -90,7 +90,7 @@ private: public: SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rSequence); - virtual ~SdrDragEntryPrimitive2DSequence(); + virtual ~SdrDragEntryPrimitive2DSequence() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -104,7 +104,7 @@ private: public: SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag); - virtual ~SdrDragEntryPointGlueDrag(); + virtual ~SdrDragEntryPointGlueDrag() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -280,7 +280,7 @@ protected: public: SdrDragObjOwn(SdrDragView& rNewView); - virtual ~SdrDragObjOwn(); + virtual ~SdrDragObjOwn() override; virtual void TakeSdrDragComment(OUString& rStr) const override; virtual bool BeginSdrDrag() override; |