[Libreoffice-commits] core.git: reportdesign/source

[Maxim Monastirsky]

 reportdesign/source/ui/dlg/Navigator.cxx |    6 ++++++
 reportdesign/source/ui/inc/Navigator.hxx |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit a0839a85e0f1b9a60a49c12359e8e56e813e0bc6
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Dec 22 21:57:35 2015 +0200

    Fix VclPtr issue in rptui::ONavigator
    
    Window ( 7VclVBox()) with live children destroyed:
    N5rptui13NavigatorTreeE()
    
    Change-Id: I974f73afd7dd259135d9bfcd47dd6bc8e7cc0d40

diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 1d757c7..b5e3335 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -911,6 +911,12 @@ void ONavigator::GetFocus()
         m_pImpl->m_pNavigatorTree->GrabFocus();
 }
 
+void ONavigator::dispose()
+{
+    m_pImpl->m_pNavigatorTree.disposeAndClear();
+    FloatingWindow::dispose();
+}
+
 } // rptui
 
 
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index ef31fa2..29f6e28 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -38,6 +38,7 @@ namespace rptui
 
         // window
         virtual void GetFocus() override;
+        virtual void dispose() override;
     };
 
 } // namespace rptui