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/ui/misc | |
| 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/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/glossary.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/misc/impfnote.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9deb0fe237fd..e3e7cbd6c6ef 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -132,7 +132,7 @@ public: SwNewGlosNameDlg( vcl::Window* pParent, const OUString& rOldName, const OUString& rOldShort ); - virtual ~SwNewGlosNameDlg(); + virtual ~SwNewGlosNameDlg() override; virtual void dispose() override; OUString GetNewName() const { return m_pNewName->GetText(); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index da9aef788044..f4c0a2c11a67 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -69,7 +69,7 @@ class SwEndNoteOptionPage : public SfxTabPage public: SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, const SfxItemSet &rSet ); - virtual ~SwEndNoteOptionPage(); + virtual ~SwEndNoteOptionPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); @@ -83,7 +83,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage { friend class VclPtr<SwFootNoteOptionPage>; SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); - virtual ~SwFootNoteOptionPage(); + virtual ~SwFootNoteOptionPage() override; public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c1da74163f2f..25d450d2665f 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -69,7 +69,7 @@ class SwNumNamesDlg : public ModalDialog public: explicit SwNumNamesDlg(vcl::Window *pParent); - virtual ~SwNumNamesDlg(); + virtual ~SwNumNamesDlg() override; virtual void dispose() override; void SetUserNames(const OUString *pList[]); OUString GetName() const { return m_pFormEdit->GetText(); } |