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/source/uibase/inc/optpage.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/source/uibase/inc/optpage.hxx')
-rw-r--r-- | sw/source/uibase/inc/optpage.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index f5df2226821a..bf7df696d0e4 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -63,7 +63,7 @@ class SwContentOptPage : public SfxTabPage DECL_LINK_TYPED(VertRulerHdl, Button*, void); public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwContentOptPage(); + virtual ~SwContentOptPage() override; virtual void dispose() override; @@ -110,7 +110,7 @@ class SwAddPrinterTabPage : public SfxTabPage public: SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwAddPrinterTabPage(); + virtual ~SwAddPrinterTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -178,7 +178,7 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK_TYPED(LoseFocusHdl, Control&, void ); SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwStdFontTabPage(); + virtual ~SwStdFontTabPage() override; virtual void dispose() override; public: @@ -222,7 +222,7 @@ class SwTableOptionsTabPage : public SfxTabPage public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwTableOptionsTabPage(); + virtual ~SwTableOptionsTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -267,7 +267,7 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage public: SwShdwCursorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwShdwCursorOptionsTabPage(); + virtual ~SwShdwCursorOptionsTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -310,7 +310,7 @@ protected: public: SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); - virtual ~SwMarkPreview(); + virtual ~SwMarkPreview() override; inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } @@ -347,7 +347,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: SwRedlineOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwRedlineOptionsTabPage(); + virtual ~SwRedlineOptionsTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -364,7 +364,7 @@ class SwTestTabPage : public SfxTabPage { public: SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwTestTabPage(); + virtual ~SwTestTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -407,7 +407,7 @@ class SwCompareOptionsTabPage : public SfxTabPage public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwCompareOptionsTabPage(); + virtual ~SwCompareOptionsTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); |