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 /formula | |
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 'formula')
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 0057a3afde2e..b1a6ed81d8a5 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -47,7 +47,7 @@ protected: public: EditBox( vcl::Window* pParent, WinBits nBits ); - virtual ~EditBox(); + virtual ~EditBox() override; virtual void dispose() override; MultiLineEdit* GetEdit() {return pMEdit;} @@ -64,7 +64,7 @@ class ArgEdit : public RefEdit { public: ArgEdit( vcl::Window* pParent, WinBits nBits ); - virtual ~ArgEdit(); + virtual ~ArgEdit() override; virtual void dispose() override; void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index c6eaea1f818a..f7ef009c3b0f 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -83,7 +83,7 @@ protected: public: FuncPage( vcl::Window* pParent,const IFunctionManager* _pFunctionManager); - virtual ~FuncPage(); + virtual ~FuncPage() override; virtual void dispose() override; void SetCategory(sal_Int32 nCat); diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 431b3521dbcf..b50192017591 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -123,7 +123,7 @@ protected: public: ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg); - virtual ~ParaWin(); + virtual ~ParaWin() override; virtual void dispose() override; void SetFunctionDesc(const IFunctionDescription* pFDesc); diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 95b0f47bcf02..5dab3c593808 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -86,7 +86,7 @@ protected: public: explicit StructPage(vcl::Window* pParent); - virtual ~StructPage(); + virtual ~StructPage() override; virtual void dispose() override; void ClearStruct(); |