From 3e710c27f7cda7d24206aa01ad7d28df4b08f69d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 16 Apr 2015 10:12:40 +0200 Subject: [PATCH] fix live children left behind at destroy Change-Id: I5c02f27e72635b5cb658a620ead63ff3229c3994 --- extensions/source/propctrlr/browserview.cxx | 2 +- forms/source/solar/control/navtoolbar.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index b2564479a7d8..097ce695db0d 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -65,7 +65,7 @@ namespace pcr if (nTmpPage) m_nActivePage = nTmpPage; } - m_pPropBox.clear(); + m_pPropBox.disposeAndClear(); vcl::Window::dispose(); } diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 07429f0640d3..88b854bf9155 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -155,7 +155,7 @@ namespace frm for (auto i = m_aChildWins.begin(); i != m_aChildWins.end(); ++i) i->disposeAndClear(); m_aChildWins.clear(); - m_pToolbar.clear(); + m_pToolbar.disposeAndClear(); vcl::Window::dispose(); }