User: obo Date: 2006/10/12 06:43:53 Modified: dba/dbaccess/source/ui/tabledesign/TEditControl.cxx
Log: INTEGRATION: CWS sb59 (1.52.2); FILE MERGED 2006/08/29 11:44:32 sb 1.52.2.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.cxx?r1=1.54&r2=1.55 Delta lines: +6 -3 ------------------- --- TEditControl.cxx 25 Sep 2006 09:43:17 -0000 1.54 +++ TEditControl.cxx 12 Oct 2006 13:43:51 -0000 1.55 @@ -1306,8 +1306,9 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_uInt16 nListCount(m_pRowList->size()); - if( (nRow<0) || (nRow>=nListCount) ) + std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount( + m_pRowList->size()); + if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) ) { OSL_ENSURE(0,"(nRow<0) || (nRow>=nListCount)"); return NULL; @@ -1578,7 +1579,9 @@ { if ( 1 == GetSelectColumnCount() ) { - sal_uInt16 nSelId = GetColumnId( FirstSelectedColumn() ); + sal_uInt16 nSelId = GetColumnId( + sal::static_int_cast< USHORT >( + FirstSelectedColumn() ) ); ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) ); aMenuPos = aColRect.TopCenter(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
