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/regionsw.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/regionsw.hxx')
| -rw-r--r-- | sw/source/uibase/inc/regionsw.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index a7d02171204e..e674c491a1bb 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -129,7 +129,7 @@ class SwEditRegionDlg : public SfxModalDialog public: SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); - virtual ~SwEditRegionDlg(); + virtual ~SwEditRegionDlg() override; virtual void dispose() override; void SelectSection(const OUString& rSectionName); @@ -180,7 +180,7 @@ class SwInsertSectionTabPage : public SfxTabPage public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); - virtual ~SwInsertSectionTabPage(); + virtual ~SwInsertSectionTabPage() override; virtual void dispose() override; void SetWrtShell(SwWrtShell& rSh); @@ -225,7 +225,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage public: SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); - virtual ~SwSectionFootnoteEndTabPage(); + virtual ~SwSectionFootnoteEndTabPage() override; virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -244,7 +244,7 @@ class SwSectionIndentTabPage : public SfxTabPage DECL_LINK_TYPED(IndentModifyHdl, Edit&, void); public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); - virtual ~SwSectionIndentTabPage(); + virtual ~SwSectionIndentTabPage() override; virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -272,7 +272,7 @@ protected: virtual short Ok() override; public: SwInsertSectionTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); - virtual ~SwInsertSectionTabDialog(); + virtual ~SwInsertSectionTabDialog() override; void SetSectionData(SwSectionData const& rSect); SwSectionData * GetSectionData() { return m_pSectionData.get(); } @@ -291,7 +291,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); - virtual ~SwSectionPropertyTabDialog(); + virtual ~SwSectionPropertyTabDialog() override; }; #endif |