summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-12-22 21:57:35 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2015-12-22 22:02:09 +0200
commita0839a85e0f1b9a60a49c12359e8e56e813e0bc6 (patch)
treefc2da9d40cd60cf53785a26e7f7e0e69931774a4 /reportdesign
parent9f87ccc854885ed4ee65e6e278b735ea051a027a (diff)
Fix VclPtr issue in rptui::ONavigator
Window ( 7VclVBox()) with live children destroyed: N5rptui13NavigatorTreeE() Change-Id: I974f73afd7dd259135d9bfcd47dd6bc8e7cc0d40
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx6
-rw-r--r--reportdesign/source/ui/inc/Navigator.hxx1
2 files changed, 7 insertions, 0 deletions
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 1d757c78d138..b5e333585264 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 ef31fa2fe063..29f6e28f4c33 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