summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/content.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /sw/source/uibase/inc/content.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/source/uibase/inc/content.hxx')
-rw-r--r--sw/source/uibase/inc/content.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index feafa87f7b1e..cc8309feb225 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -113,7 +113,7 @@ public:
SwGraphicContent(const SwContentType* pCnt, const OUString& rName, const OUString& rLink, long nYPos)
: SwContent( pCnt, rName, nYPos ), sLink( rLink )
{}
- virtual ~SwGraphicContent();
+ virtual ~SwGraphicContent() override;
const OUString& GetLink() const {return sLink;}
};
@@ -125,7 +125,7 @@ public:
SwTOXBaseContent(const SwContentType* pCnt, const OUString& rName, long nYPos, const SwTOXBase& rBase)
: SwContent( pCnt, rName, nYPos ), pBase(&rBase)
{}
- virtual ~SwTOXBaseContent();
+ virtual ~SwTOXBaseContent() override;
const SwTOXBase* GetTOXBase() const {return pBase;}
};
@@ -155,7 +155,7 @@ protected:
static OUString RemoveNewline(const OUString&);
public:
SwContentType(SwWrtShell* pParent, ContentTypeId nType, sal_uInt8 nLevel );
- virtual ~SwContentType();
+ virtual ~SwContentType() override;
void Init(bool* pbInvalidateWindow = nullptr);