vcl: VclPtr conversion in dbaccess

Change-Id: I85fce0403121ffe55204d78445e4809960ec404a

4 files changed, 6 insertions, 9 deletions

diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index 03a9b56c8826..1f18d83af39a 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -38,10 +38,6 @@ ORelationTableConnection::ORelationTableConnection( const ORelationTableConnecti
     // no own members, thus the base class functionality is enough
 }
 
-ORelationTableConnection::~ORelationTableConnection()
-{
-}
-
 ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn )
 {
     // this doesn't change anything, since the base class tests this, too and I don't have my own members to copy
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
index 24339b521a23..3ebea9b873f3 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
@@ -31,7 +31,6 @@ namespace dbaui
         ORelationTableConnection( ORelationTableView* pContainer, const TTableConnectionData::value_type& pTabConnData );
         ORelationTableConnection( const ORelationTableConnection& rConn );
             // wichtiger Kommentar zum CopyConstructor siehe OTableConnection(const OTableConnection&)
-        virtual ~ORelationTableConnection();
 
         ORelationTableConnection& operator=( const ORelationTableConnection& rConn );
 
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index a27f4a5b2eb6..86b52a38bd6c 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -50,10 +50,6 @@ ORelationDesignView::ORelationDesignView(vcl::Window* _pParent, ORelationControl
 {
 }
 
-ORelationDesignView::~ORelationDesignView()
-{
-}
-
 void ORelationDesignView::Construct()
 {
     m_pTableView    = new ORelationTableView(m_pScrollWindow,this);
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 38ee81fb1715..bf39293e01a2 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -73,8 +73,14 @@ ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignVie
 
 ORelationTableView::~ORelationTableView()
 {
+    dispose();
+}
+
+void ORelationTableView::dispose()
+{
     if ( m_pContainerListener.is() )
         m_pContainerListener->dispose();
+    OJoinTableView::dispose();
 }
 
 void ORelationTableView::ReSync()