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 /cui/source/inc/dlgname.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 'cui/source/inc/dlgname.hxx')
| -rw-r--r-- | cui/source/inc/dlgname.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 1984a54b5c02..ab57fe5746fb 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -40,7 +40,7 @@ private: public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); - virtual ~SvxNameDialog(); + virtual ~SvxNameDialog() override; virtual void dispose() override; void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -90,7 +90,7 @@ private: public: // constructor SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); - virtual ~SvxObjectNameDialog(); + virtual ~SvxObjectNameDialog() override; virtual void dispose() override; // data access @@ -117,7 +117,7 @@ private: public: // constructor SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); - virtual ~SvxObjectTitleDescDialog(); + virtual ~SvxObjectTitleDescDialog() override; virtual void dispose() override; // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } @@ -143,7 +143,7 @@ private: public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr ); - virtual ~SvxMessDialog(); + virtual ~SvxMessDialog() override; virtual void dispose() override; void DisableButton( SvxMessDialogButton nBtnId); |