summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-07-16 15:00:50 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2015-07-16 15:12:22 +0300
commit383b75f4f516d6a5d256ffc08bc0e7836520447b (patch)
tree97346c6266d451551b0d7f8042f991a4ef354174 /fpicker
parent85a1a264621a21590e328df735a0b03195b852fc (diff)
Hopefully get the right dispose order
warn:legacy.osl:9070:1:vcl/source/window/window.cxx:281: Window ( 17FileViewContainer()) with live children destroyed: 11SvtFileView() 8Splitter() 10FolderTree() Change-Id: I6be256337123fc1c3ff2651bcd9f695c8918bb8e
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/RemoteFilesDialog.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 9c37347583ce..716c229d6df7 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -36,6 +36,7 @@ class FileViewContainer : public vcl::Window
virtual void dispose() SAL_OVERRIDE
{
m_pFileView.clear();
+ m_pTreeView.clear();
m_pSplitter.clear();
vcl::Window::dispose();
}
@@ -248,10 +249,10 @@ void RemoteFilesDialog::dispose()
batch->commit();
- m_pContainer.disposeAndClear(); // container must be first!
m_pTreeView.disposeAndClear();
m_pFileView.disposeAndClear();
m_pSplitter.disposeAndClear();
+ m_pContainer.disposeAndClear();
m_pPath.disposeAndClear();
m_pOk_btn.clear();