summaryrefslogtreecommitdiff
path: root/sw/inc/unosett.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/inc/unosett.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/inc/unosett.hxx')
-rw-r--r--sw/inc/unosett.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index ad80037d3797..21e1d69196af 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -49,7 +49,7 @@ class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
- virtual ~SwXFootnoteProperties();
+ virtual ~SwXFootnoteProperties() override;
public:
SwXFootnoteProperties(SwDoc* pDoc);
@@ -79,7 +79,7 @@ class SwXEndnoteProperties : public cppu::WeakAggImplHelper2
SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
- virtual ~SwXEndnoteProperties();
+ virtual ~SwXEndnoteProperties() override;
public:
SwXEndnoteProperties(SwDoc* pDoc);
@@ -109,7 +109,7 @@ class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2
SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
- virtual ~SwXLineNumberingProperties();
+ virtual ~SwXLineNumberingProperties() override;
public:
SwXLineNumberingProperties(SwDoc* pDoc);
@@ -152,7 +152,7 @@ private:
const SfxItemPropertySet* m_pPropertySet;
bool bOwnNumRuleCreated;
protected:
- virtual ~SwXNumberingRules();
+ virtual ~SwXNumberingRules() override;
public:
SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering
@@ -223,7 +223,7 @@ public:
class SwXChapterNumbering : public SwXNumberingRules
{
protected:
- virtual ~SwXChapterNumbering();
+ virtual ~SwXChapterNumbering() override;
public:
SwXChapterNumbering(SwDocShell& rDocSh);
@@ -261,7 +261,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4
sal_Int8 nSepLineStyle;
protected:
- virtual ~SwXTextColumns();
+ virtual ~SwXTextColumns() override;
public:
SwXTextColumns();
SwXTextColumns(const SwFormatCol& rFormatCol);