User: hr Date: 06/06/19 19:59:22 Modified: /dba/dbaccess/source/ui/control/ RelationControl.cxx
Log: INTEGRATION: CWS warnings01 (1.15.74); FILE MERGED 2006/03/24 15:36:06 fs 1.15.74.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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&r2=1.16 Delta lines: +10 -9 -------------------- --- RelationControl.cxx 23 Sep 2005 12:23:20 -0000 1.15 +++ RelationControl.cxx 20 Jun 2006 02:59:20 -0000 1.16 @@ -155,7 +155,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(); @@ -164,6 +164,7 @@ DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchDeactivate, void* ); }; + //======================================================================== // class ORelationControl //======================================================================== @@ -173,10 +174,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); } @@ -317,7 +318,7 @@ } //------------------------------------------------------------------------------ - String ORelationControl::GetCellText( long nRow, USHORT nColId ) + String ORelationControl::GetCellText( long nRow, USHORT nColId ) const { DBG_CHKTHIS(ORelationControl,NULL); String sText; @@ -341,7 +342,7 @@ } //------------------------------------------------------------------------------ - void ORelationControl::InitController( CellControllerRef& rController, long nRow, USHORT nColumnId ) + void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(ORelationControl,NULL); @@ -375,7 +376,7 @@ } //------------------------------------------------------------------------------ - CellController* ORelationControl::GetController( long nRow, USHORT nColumnId ) + CellController* ORelationControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ ) { DBG_CHKTHIS(ORelationControl,NULL); return new ListBoxCellController( m_pListCell ); @@ -461,7 +462,7 @@ if ( pConn ) { m_pConnData->CopyFrom(*pConn->GetData()); - m_pBoxControl->getContainer()->notifyConnectionChange(m_pConnData); + m_pBoxControl->getContainer()->notifyConnectionChange(); } else { @@ -506,9 +507,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]
