Cleanup layout and window merge.
Change-Id: Ic61f85ef159981721420ebc5157bcf09cf09ec51
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 2575142e..650ec615 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;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bcf21e9..cd26b3d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -159,8 +159,6 @@ void Window::dispose()
xCanvasComponent->dispose();
}
mpWindowImpl->mbInDtor = true;
CallEventListeners( VCLEVENT_OBJECT_DYING );
// do not send child events for frames that were registered as native frames
