[Libreoffice-commits] core.git: Branch 'feature/vclptr' - extensions/source forms/source

[Noel Grandin]

 extensions/source/propctrlr/browserview.cxx |    2 +-
 forms/source/solar/control/navtoolbar.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3e710c27f7cda7d24206aa01ad7d28df4b08f69d
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Apr 16 10:12:40 2015 +0200

    fix live children left behind at destroy
    
    Change-Id: I5c02f27e72635b5cb658a620ead63ff3229c3994

diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index b256447..097ce69 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 07429f0..88b854b 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();
     }