diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 14:14:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 14:14:15 +0100 |
| commit | 93a8635776834a03fc794cf8eba1e98a88e88be8 (patch) | |
| tree | 3e23bb18b3ad0f430e3b23f967f60aacd7e6932d /include/vcl | |
| parent | 567dbbc5e952170f20673ca795a609220aee792f (diff) | |
Cleanup layout and window merge.
Change-Id: Ic61f85ef159981721420ebc5157bcf09cf09ec51
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/layout.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 2575142e1d4e..650ec615fe01 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -523,7 +523,7 @@ public: m_pDisclosureButton->Show(); } virtual ~VclExpander() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pDisclosureButton.disposeAndClear(); VclBin::dispose(); } + virtual void dispose() SAL_OVERRIDE; virtual vcl::Window *get_child() SAL_OVERRIDE; virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; @@ -561,7 +561,7 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin public: VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); virtual ~VclScrolledWindow() { disposeOnce(); } - void dispose() SAL_OVERRIDE { m_pVScroll.disposeAndClear(); m_pHScroll.disposeAndClear(); m_aScrollBarBox.clear(); VclBin::dispose(); } + virtual void dispose() SAL_OVERRIDE; virtual vcl::Window *get_child() SAL_OVERRIDE; virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; |