summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui/mmgreetingspage.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/ui/dbui/mmgreetingspage.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/ui/dbui/mmgreetingspage.hxx')
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index f81090a21069..a1fc1909b375 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -99,7 +99,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage,
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
public:
SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent);
- virtual ~SwMailMergeGreetingsPage();
+ virtual ~SwMailMergeGreetingsPage() override;
virtual void dispose() override;
};
@@ -115,7 +115,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler
DECL_LINK_TYPED(OKHdl, Button*, void);
public:
SwMailBodyDialog(vcl::Window* pParent);
- virtual ~SwMailBodyDialog();
+ virtual ~SwMailBodyDialog() override;
virtual void dispose() override;
void SetBody(const OUString& rBody ) {m_pBodyMLE->SetText(rBody);}