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 /vcl/source/edit | |
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 'vcl/source/edit')
-rw-r--r-- | vcl/source/edit/textdat2.hxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/textund2.hxx | 6 | ||||
-rw-r--r-- | vcl/source/edit/textundo.hxx | 4 | ||||
-rw-r--r-- | vcl/source/edit/textview.cxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/vclmedit.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 9b0dc4c1d26c..ce84aa94b7d2 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -253,7 +253,7 @@ private: public: IdleFormatter(); - virtual ~IdleFormatter(); + virtual ~IdleFormatter() override; void DoIdleFormat( TextView* pV, sal_uInt16 nMaxRestarts ); void ForceTimeout(); diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index bcb44bbf34b7..729a130ad456 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -31,7 +31,7 @@ private: public: TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uInt32 nPara ); - virtual ~TextUndoDelPara(); + virtual ~TextUndoDelPara() override; virtual void Undo() override; virtual void Redo() override; @@ -47,7 +47,7 @@ private: public: TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos ); - virtual ~TextUndoConnectParas(); + virtual ~TextUndoConnectParas() override; virtual void Undo() override; virtual void Redo() override; @@ -63,7 +63,7 @@ private: public: TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos ); - virtual ~TextUndoSplitPara(); + virtual ~TextUndoSplitPara() override; virtual void Undo() override; virtual void Redo() override; diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index 6db0df05a60a..caa985a84eb3 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -41,7 +41,7 @@ protected: public: explicit TextUndoManager( TextEngine* pTextEngine ); - virtual ~TextUndoManager(); + virtual ~TextUndoManager() override; using SfxUndoManager::Undo; virtual bool Undo() override; @@ -65,7 +65,7 @@ protected: public: explicit TextUndo( TextEngine* pTextEngine ); - virtual ~TextUndo(); + virtual ~TextUndo() override; TextEngine* GetTextEngine() const { return mpTextEngine; } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 790077b4b086..df8414bab346 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -68,7 +68,7 @@ private: public: explicit TETextDataObject( const OUString& rText ); - virtual ~TETextDataObject(); + virtual ~TETextDataObject() override; OUString& GetText() { return maText; } SvMemoryStream& GetHTMLStream() { return maHTMLStream; } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 97ab7557c04b..35798c6da052 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -46,7 +46,7 @@ private: public: explicit TextWindow( vcl::Window* pParent ); - virtual ~TextWindow(); + virtual ~TextWindow() override; virtual void dispose() override; ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } @@ -96,7 +96,7 @@ protected: public: ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits nWinStyle ); - virtual ~ImpVclMEdit(); + virtual ~ImpVclMEdit() override; void SetModified( bool bMod ); bool IsModified() const; |