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/scriptdlg.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/scriptdlg.hxx')
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index dd588601a33f..b158ffe8fdfd 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -71,7 +71,7 @@ public: css::uno::Reference< css::script::browse::XBrowseNode >& node, css::uno::Reference< css::frame::XModel>& model ); SFTreeListBox(vcl::Window* pParent); - virtual ~SFTreeListBox(); + virtual ~SFTreeListBox() override; virtual void dispose() override; SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap, @@ -99,7 +99,7 @@ private: VclPtr<Edit> m_pEdit; public: CuiInputDialog(vcl::Window * pParent, InputDialogMode nMode); - virtual ~CuiInputDialog(); + virtual ~CuiInputDialog() override; virtual void dispose() override; OUString GetObjectName() const { return m_pEdit->GetText(); } @@ -173,7 +173,7 @@ public: // prob need another arg in the ctor // to specify the language or provider SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); - virtual ~SvxScriptOrgDialog(); + virtual ~SvxScriptOrgDialog() override; virtual void dispose() override; virtual short Execute() override; @@ -192,7 +192,7 @@ public: SvxScriptErrorDialog( vcl::Window* parent, css::uno::Any aException ); - virtual ~SvxScriptErrorDialog(); + virtual ~SvxScriptErrorDialog() override; short Execute() override; }; |