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/unocoll.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/unocoll.hxx')
-rw-r--r-- | sw/inc/unocoll.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index a3746624eec3..3a830353ae38 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -274,7 +274,7 @@ class SW_DLLPUBLIC SwXTextTables : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXTextTables(); + virtual ~SwXTextTables() override; public: SwXTextTables(SwDoc* pDoc); @@ -313,7 +313,7 @@ class SW_DLLPUBLIC SwXFrames : public SwXFramesBaseClass, { const FlyCntType m_eType; protected: - virtual ~SwXFrames(); + virtual ~SwXFrames() override; public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); @@ -342,7 +342,7 @@ public: class SwXTextFrames : public SwXFrames { protected: - virtual ~SwXTextFrames(); + virtual ~SwXTextFrames() override; public: SwXTextFrames(SwDoc* pDoc); @@ -356,7 +356,7 @@ public: class SwXTextGraphicObjects : public SwXFrames { protected: - virtual ~SwXTextGraphicObjects(); + virtual ~SwXTextGraphicObjects() override; public: SwXTextGraphicObjects(SwDoc* pDoc); @@ -370,7 +370,7 @@ public: class SwXTextEmbeddedObjects : public SwXFrames { protected: - virtual ~SwXTextEmbeddedObjects(); + virtual ~SwXTextEmbeddedObjects() override; public: SwXTextEmbeddedObjects(SwDoc* pDoc); @@ -385,7 +385,7 @@ class SwXTextSections : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXTextSections(); + virtual ~SwXTextSections() override; public: SwXTextSections(SwDoc* pDoc); @@ -414,7 +414,7 @@ class SwXBookmarks : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXBookmarks(); + virtual ~SwXBookmarks() override; public: SwXBookmarks(SwDoc* pDoc); @@ -445,7 +445,7 @@ class SwXNumberingRulesCollection : public cppu::WeakImplHelper public SwUnoCollection { protected: - virtual ~SwXNumberingRulesCollection(); + virtual ~SwXNumberingRulesCollection() override; public: SwXNumberingRulesCollection( SwDoc* pDoc ); @@ -473,7 +473,7 @@ class SwXFootnotes : public SwSimpleIndexAccessBaseClass, const bool m_bEndnote; protected: - virtual ~SwXFootnotes(); + virtual ~SwXFootnotes() override; public: SwXFootnotes(bool bEnd, SwDoc* pDoc); @@ -497,7 +497,7 @@ class SwXReferenceMarks : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXReferenceMarks(); + virtual ~SwXReferenceMarks() override; public: SwXReferenceMarks(SwDoc* pDoc); |