Fix more misc. lifecycle mistakes.

Change-Id: Iadf0767d41830296a441299bf10aaa1e7629a824

2 files changed, 7 insertions, 13 deletions

diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index f6b91270a888..5beb0eec435f 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -56,7 +56,7 @@ void OTitleWindow::dispose()
     {
         m_pChild->Hide();
     }
-    m_pChild.clear();
+    m_pChild.disposeAndClear();
     m_aSpace1.disposeAndClear();
     m_aSpace2.disposeAndClear();
     m_aTitle.disposeAndClear();
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 356b2eb31d36..9a24ebfa1480 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -93,15 +93,11 @@ void OAppBorderWindow::dispose()
 {
     // destroy children
     if ( m_pPanel )
-    {
         m_pPanel->Hide();
-    }
+    m_pPanel.disposeAndClear();
     if ( m_pDetailView )
-    {
         m_pDetailView->Hide();
-    }
-    m_pPanel.clear();
-    m_pDetailView.clear();
+    m_pDetailView.disposeAndClear();
     m_pView.clear();
     vcl::Window::dispose();
 }
@@ -213,12 +209,10 @@ OApplicationView::~OApplicationView()
 
 void OApplicationView::dispose()
 {
-    if (m_xObject.is())
-    {
-        stopComponentListening(m_xObject);
-        m_xObject.clear();
-    }
-    m_pWin.clear();
+    stopComponentListening(m_xObject);
+    m_xObject.clear();
+    m_pWin->Hide();
+    m_pWin.disposeAndClear();
     ODataView::dispose();
 }