1 files changed, 9 insertions, 5 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index b61a512c1de6..61e40284dd92 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -56,15 +56,19 @@ OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rContr
     ,m_pTableView(NULL)
     ,m_rController( _rController )
 {
-    m_pScrollWindow = new OScrollWindowHelper(this);
+    m_pScrollWindow = VclPtr<OScrollWindowHelper>::Create(this);
 }
 
 OJoinDesignView::~OJoinDesignView()
 {
-    boost::scoped_ptr<vcl::Window> aT3(m_pScrollWindow);
-    m_pScrollWindow = NULL;
-    boost::scoped_ptr<vcl::Window> aT2(m_pTableView);
-    m_pTableView = NULL;
+    disposeOnce();
+}
+
+void OJoinDesignView::dispose()
+{
+    m_pScrollWindow.disposeAndClear();
+    m_pTableView.disposeAndClear();
+    ODataView::dispose();
 }
 
 void OJoinDesignView::Construct()