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 /basctl/source/basicide/baside2.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 'basctl/source/basicide/baside2.hxx')
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 8a04886495c3..4ad9d08bae2f 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -135,7 +135,7 @@ protected: public: EditorWindow (vcl::Window* pParent, ModulWindow*); - virtual ~EditorWindow(); + virtual ~EditorWindow() override; virtual void dispose() override; ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); } @@ -209,7 +209,7 @@ protected: public: WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ); - virtual ~WatchTreeListBox(); + virtual ~WatchTreeListBox() override; virtual void dispose() override; void RequestingChildren( SvTreeListEntry * pParent ) override; @@ -241,7 +241,7 @@ protected: public: explicit WatchWindow (Layout* pParent); - virtual ~WatchWindow(); + virtual ~WatchWindow() override; virtual void dispose() override; void AddWatch( const OUString& rVName ); @@ -262,7 +262,7 @@ protected: public: explicit StackWindow (Layout* pParent); - virtual ~StackWindow(); + virtual ~StackWindow() override; virtual void dispose() override; void UpdateCalls(); @@ -285,7 +285,7 @@ protected: public: explicit ComplexEditorWindow( ModulWindow* pParent ); - virtual ~ComplexEditorWindow(); + virtual ~ComplexEditorWindow() override; virtual void dispose() override; BreakPointWindow& GetBrkWindow() { return *aBrkWindow.get(); } LineNumberWindow& GetLineNumberWindow() { return *aLineNumberWindow.get(); } @@ -325,7 +325,7 @@ protected: public: ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule ); - virtual ~ModulWindow(); + virtual ~ModulWindow() override; virtual void dispose() override; virtual void ExecuteCommand (SfxRequest& rReq) override; @@ -417,7 +417,7 @@ class ModulWindowLayout: public Layout { public: ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&); - virtual ~ModulWindowLayout(); + virtual ~ModulWindowLayout() override; virtual void dispose() override; public: // Layout: @@ -451,7 +451,7 @@ private: { public: SyntaxColors (); - virtual ~SyntaxColors (); + virtual ~SyntaxColors () override; public: void SetActiveEditor (EditorWindow* pEditor_) { pEditor = pEditor_; } void SettingsChanged (); @@ -490,7 +490,7 @@ private: public: explicit CodeCompleteListBox( CodeCompleteWindow* pPar ); - virtual ~CodeCompleteListBox(); + virtual ~CodeCompleteListBox() override; virtual void dispose() override; void InsertSelectedEntry(); //insert the selected entry @@ -513,7 +513,7 @@ private: public: explicit CodeCompleteWindow( EditorWindow* pPar ); - virtual ~CodeCompleteWindow(); + virtual ~CodeCompleteWindow() override; virtual void dispose() override; void InsertEntry( const OUString& aStr ); |