User: hr Date: 2007-11-01 15:33:05+0000 Modified: dba/dbaccess/source/ui/querydesign/TableConnection.cxx
Log: INTEGRATION: CWS dba24b (1.14.128); FILE MERGED 2007/08/16 06:14:44 oj 1.14.128.1: #i56898# clean up of the class structure File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableConnection.cxx?r1=1.14&r2=1.15 Delta lines: +4 -5 ------------------- --- TableConnection.cxx 2006-09-17 07:24:20+0000 1.14 +++ TableConnection.cxx 2007-11-01 15:33:03+0000 1.15 @@ -61,7 +61,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -TYPEINIT0(OTableConnection); //======================================================================== // class OTableConnection //======================================================================== @@ -69,7 +68,7 @@ { DBG_NAME(OTableConnection) //------------------------------------------------------------------------ - OTableConnection::OTableConnection( OJoinTableView* _pContainer, OTableConnectionData* _pTabConnData ) + OTableConnection::OTableConnection( OJoinTableView* _pContainer,const TTableConnectionData::value_type& _pTabConnData ) :Window(_pContainer) ,m_pData( _pTabConnData ) ,m_pParent( _pContainer ) @@ -82,9 +81,9 @@ //------------------------------------------------------------------------ OTableConnection::OTableConnection( const OTableConnection& _rConn ) : Window(_rConn.m_pParent) + ,m_pData(_rConn.GetData()->NewInstance()) { DBG_CTOR(OTableConnection,NULL); - m_pData = _rConn.GetData()->NewInstance(); *this = _rConn; } @@ -162,12 +161,12 @@ //------------------------------------------------------------------------ OTableWindow* OTableConnection::GetSourceWin() const { - return m_pParent->GetTabWindow( GetData()->GetSourceWinName() ); + return m_pParent->GetTabWindow( GetData()->getReferencingTable()->GetWinName() ); } //------------------------------------------------------------------------ OTableWindow* OTableConnection::GetDestWin() const { - return m_pParent->GetTabWindow( GetData()->GetDestWinName() ); + return m_pParent->GetTabWindow( GetData()->getReferencedTable()->GetWinName() ); } //------------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
