VclPtr: undisposed things and dispose order on query design window close

Change-Id: I3070d52e15febe2f5981ffdf5d665e28fa4f799b
(cherry picked from commit 82f15336)

dbaccess/source/ui/querydesign/JoinDesignView.cxx

@@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView()
 
 void OJoinDesignView::dispose()
 {
-    m_pScrollWindow.disposeAndClear();
     m_pTableView.disposeAndClear();
+    m_pScrollWindow.disposeAndClear();
     ODataView::dispose();
 }
 

dbaccess/source/ui/querydesign/QueryViewSwitch.cxx

@@ -42,6 +42,9 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
 
 OQueryViewSwitch::~OQueryViewSwitch()
 {
+    // destroy children
+    m_pDesignView.disposeAndClear();
+    m_pTextView.disposeAndClear();
 }
 
 void OQueryViewSwitch::Construct()