Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:50:21 Modified: dba/dbaccess/source/ui/control/RelationControl.cxx
Log: RESYNC: (1.15-1.16); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: RelationControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/RelationControl.cxx?r1=1.15.4.3&r2=1.15.4.4 Delta lines: +13 -12 --------------------- --- RelationControl.cxx 25 Apr 2006 12:51:36 -0000 1.15.4.3 +++ RelationControl.cxx 4 Jul 2006 07:50:18 -0000 1.15.4.4 @@ -152,7 +152,7 @@ virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const; virtual BOOL SeekRow( long nRow ); virtual BOOL SaveModified(); - virtual String GetCellText( long nRow, USHORT nColId ); + virtual String GetCellText( long nRow, USHORT nColId ) const; virtual void CellModified(); @@ -161,6 +161,7 @@ DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchDeactivate, void* ); }; + //======================================================================== // class ORelationControl //======================================================================== @@ -170,10 +171,10 @@ :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_3DLOOK | WB_BORDER ) ,m_pListCell( NULL ) ,m_pConnData( NULL ) - ,m_xSourceDef( NULL ) - ,m_xDestDef( NULL ) ,m_pTableMap(_pTableMap) ,m_pBoxControl(pParent) + ,m_xSourceDef( NULL ) + ,m_xDestDef( NULL ) { DBG_CTOR(ORelationControl,NULL); } @@ -314,7 +315,7 @@ } //------------------------------------------------------------------------------ - String ORelationControl::GetCellText( long nRow, USHORT nColId ) + String ORelationControl::GetCellText( long nRow, USHORT nColId ) const { DBG_CHKTHIS(ORelationControl,NULL); String sText; @@ -338,7 +339,7 @@ } //------------------------------------------------------------------------------ - void ORelationControl::InitController( CellControllerRef& rController, long nRow, USHORT nColumnId ) + void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(ORelationControl,NULL); @@ -372,7 +373,7 @@ } //------------------------------------------------------------------------------ - CellController* ORelationControl::GetController( long nRow, USHORT nColumnId ) + CellController* ORelationControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ ) { DBG_CHKTHIS(ORelationControl,NULL); return new ListBoxCellController( m_pListCell ); @@ -458,7 +459,7 @@ if ( pConn ) { m_pConnData->CopyFrom(*pConn->GetData()); - m_pBoxControl->getContainer()->notifyConnectionChange(m_pConnData); + m_pBoxControl->getContainer()->notifyConnectionChange(); } else { @@ -503,9 +504,9 @@ const OJoinTableView::OTableWindowMap* _pTableMap, IRelationControlInterface* _pParentDialog) : Window(_pParent,_rResId) + , m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES)) , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE)) , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE)) - , m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES)) , m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS)) , m_pTableMap(_pTableMap) , m_pParentDialog(_pParentDialog) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
