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 /sw/inc/undobj.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 'sw/inc/undobj.hxx')
-rw-r--r-- | sw/inc/undobj.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 5d3e0d30ae8e..d081e63b90d5 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -95,7 +95,7 @@ private: public: SwUndo(SwUndoId const nId, const SwDoc* pDoc); - virtual ~SwUndo(); + virtual ~SwUndo() override; /** Returns textual comment for this undo object. @@ -239,7 +239,7 @@ protected: SwUndoInserts( SwUndoId nUndoId, const SwPaM& ); public: - virtual ~SwUndoInserts(); + virtual ~SwUndoInserts() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; @@ -280,7 +280,7 @@ protected: sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } public: - virtual ~SwUndoFlyBase(); + virtual ~SwUndoFlyBase() override; }; @@ -291,7 +291,7 @@ class SwUndoInsLayFormat : public SwUndoFlyBase public: SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx ); - virtual ~SwUndoInsLayFormat(); + virtual ~SwUndoInsLayFormat() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; |