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 /include/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 'include/formula')
-rw-r--r-- | include/formula/FormulaOpCodeMapperObj.hxx | 2 | ||||
-rw-r--r-- | include/formula/formula.hxx | 4 | ||||
-rw-r--r-- | include/formula/funcutl.hxx | 4 | ||||
-rw-r--r-- | include/formula/token.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index fdf28eb3789f..f3c19a2c6ca1 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -58,7 +58,7 @@ public: protected: FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler> && _pCompiler); - virtual ~FormulaOpCodeMapperObj(); + virtual ~FormulaOpCodeMapperObj() override; private: // XFormulaOpCodeMapper diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index ac5aa57a70d8..923c60fe9390 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -66,7 +66,7 @@ public: FormulaModalDialog( vcl::Window* pParent ,IFunctionManager* _pFunctionMgr ,IControlReferenceHandler* _pDlg = nullptr ); - virtual ~FormulaModalDialog(); + virtual ~FormulaModalDialog() override; virtual void dispose() override; private: @@ -102,7 +102,7 @@ public: , vcl::Window* pParent , IFunctionManager* _pFunctionMgr , IControlReferenceHandler* _pDlg = nullptr ); - virtual ~FormulaDlg(); + virtual ~FormulaDlg() override; virtual void dispose() override; private: ::std::unique_ptr<FormulaDlg_Impl> m_pImpl; diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 494543edbeaa..04f919c46c6e 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -59,7 +59,7 @@ public: RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId ); RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); - virtual ~RefEdit(); + virtual ~RefEdit() override; virtual void dispose() override; void SetRefString( const OUString& rStr ); @@ -104,7 +104,7 @@ protected: public: RefButton(vcl::Window* _pParent, WinBits nStyle = 0); - virtual ~RefButton(); + virtual ~RefButton() override; virtual void dispose() override; void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); void SetStartImage(); diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 6bbda35edaaf..e0ee1201095b 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -407,7 +407,7 @@ public: pJump = new short[ r.pJump[0] + 1 ]; memcpy( pJump, r.pJump, (r.pJump[0] + 1) * sizeof(short) ); } - virtual ~FormulaJumpToken(); + virtual ~FormulaJumpToken() override; virtual short* GetJump() const override; virtual bool operator==( const formula::FormulaToken& rToken ) const override; virtual FormulaToken* Clone() const override { return new FormulaJumpToken(*this); } |