summaryrefslogtreecommitdiff
path: root/include/svtools/editbrowsebox.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/svtools/editbrowsebox.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/svtools/editbrowsebox.hxx')
-rw-r--r--include/svtools/editbrowsebox.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index e2f699875954..9dcba3ba6a12 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -91,7 +91,7 @@ namespace svt
public:
CellController(Control* pW);
- virtual ~CellController();
+ virtual ~CellController() override;
Control& GetWindow() const { return *const_cast< CellController* >( this )->pWindow; }
@@ -237,7 +237,7 @@ namespace svt
public:
EditCellController( Edit* _pEdit );
EditCellController( IEditImplementation* _pImplementation );
- virtual ~EditCellController( );
+ virtual ~EditCellController( ) override;
const IEditImplementation* GetEditImplementation( ) const { return m_pEditImplementation; }
IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; }
@@ -284,7 +284,7 @@ namespace svt
public:
CheckBoxControl(vcl::Window* pParent);
- virtual ~CheckBoxControl();
+ virtual ~CheckBoxControl() override;
virtual void dispose() override;
virtual void GetFocus() override;
@@ -587,7 +587,7 @@ namespace svt
public:
EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE );
EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode = BrowserMode::NONE );
- virtual ~EditBrowseBox();
+ virtual ~EditBrowseBox() override;
virtual void dispose() override;
bool IsEditing() const {return aController.Is();}