Container should be disposed before childs

Change-Id: Ia6feb9c57ce574236e4763c61484fb5a14e55ff4

1 files changed, 7 insertions, 1 deletions

diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 4d5c61914b6a..6b4e39bf15e4 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -196,6 +196,9 @@ class FileViewContainer : public vcl::Window
 
     void changeFocus( bool bReverse )
     {
+        if( !m_pFileView || !m_pTreeView )
+            return;
+
         if( !bReverse && m_nCurrentFocus < 4 )
         {
             m_pFocusWidgets[++m_nCurrentFocus]->SetFakeFocus( true );
@@ -210,6 +213,9 @@ class FileViewContainer : public vcl::Window
 
     virtual void GetFocus() SAL_OVERRIDE
     {
+        if( !m_pFileView || !m_pTreeView )
+            return;
+
         m_nCurrentFocus = 1;
         m_pFocusWidgets[m_nCurrentFocus]->SetFakeFocus( true );
         m_pFocusWidgets[m_nCurrentFocus]->GrabFocus();
@@ -353,10 +359,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();