summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/column.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/column.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/column.hxx')
-rw-r--r--sw/source/uibase/inc/column.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index a9fa3d504339..446221c6681e 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -66,7 +66,7 @@ class SwColumnDlg : public SfxModalDialog
public:
SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh);
- virtual ~SwColumnDlg();
+ virtual ~SwColumnDlg() override;
virtual void dispose() override;
};
@@ -168,7 +168,7 @@ class SwColumnPage : public SfxTabPage
public:
SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
- virtual ~SwColumnPage();
+ virtual ~SwColumnPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);