4 files changed, 19 insertions, 19 deletions
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 3e66f5cb6db3..83a436aa63e3 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -106,7 +106,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
         m_pVclControl = NULL;
         getVclControl();
 
-        OSL_ENSURE(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !");
+        OSL_ENSURE(m_pVclControl != nullptr, "UnoDataBrowserView::Construct : no real grid control !");
     }
     catch(const Exception&)
     {
@@ -122,17 +122,10 @@ UnoDataBrowserView::~UnoDataBrowserView()
 
 void UnoDataBrowserView::dispose()
 {
-    {
-        boost::scoped_ptr<Splitter> aTemp(m_pSplitter);
-        m_pSplitter = NULL;
-    }
+    m_pSplitter.clear();
     setTreeView(NULL);
 
-    if ( m_pStatus )
-    {
-        delete m_pStatus;
-        m_pStatus = NULL;
-    }
+    m_pStatus.clear();
 
     try
     {
@@ -141,6 +134,8 @@ void UnoDataBrowserView::dispose()
     }
     catch(const Exception&)
     {}
+    m_pTreeView.clear();
+    m_pVclControl.clear();
     ODataView::dispose();
 }
 
@@ -162,13 +157,9 @@ void UnoDataBrowserView::setSplitter(Splitter* _pSplitter)
 
 void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
 {
-    if (m_pTreeView != _pTreeView)
+    if (m_pTreeView.get() != _pTreeView)
     {
-        if (m_pTreeView)
-        {
-            boost::scoped_ptr<vcl::Window> aTemp(m_pTreeView);
-            m_pTreeView = NULL;
-        }
+        m_pTreeView.clear();
         m_pTreeView = _pTreeView;
     }
 }
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 0956ff13a6e2..d80dc3d0b09f 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -58,9 +58,8 @@ void DBTreeView::dispose()
             m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox);
             m_pTreeListBox->DisconnectFromModel();
         }
-        boost::scoped_ptr<vcl::Window> aTemp(m_pTreeListBox);
-        m_pTreeListBox = NULL;
     }
+    m_pTreeListBox.clear();
     vcl::Window::dispose();
 }
 
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index bc9e11be4cb1..5313583fc061 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -31,7 +31,7 @@ namespace dbaui
     class DBTreeView : public vcl::Window
     {
     private:
-        DBTreeListBox*  m_pTreeListBox;
+        VclPtr<DBTreeListBox>  m_pTreeListBox;
     protected:
         // window overridables
         virtual void Resize() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 0613b7d54c50..7b129ee4f313 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -983,6 +983,16 @@ Reference< XConnection > OGenericUnoController::connect( const OUString& _rDataS
     return xConnection;
 }
 
+void OGenericUnoController::setView( ODataView& i_rView )
+{
+    m_pView = &i_rView;
+}
+
+void OGenericUnoController::clearView()
+{
+    m_pView = NULL;
+}
+
 void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo)
 {
     ::dbaui::showError(_rInfo,getView(),getORB());