User: vg Date: 06/03/31 01:20:30 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.cxx
Log: INTEGRATION: CWS long2int (1.44.28); FILE MERGED 2006/02/23 11:07:35 kendy 1.44.28.3: RESYNC: (1.45-1.46); FILE MERGED 2006/01/16 13:19:25 kendy 1.44.28.2: RESYNC: (1.44-1.45); FILE MERGED 2005/11/09 15:16:54 kendy 1.44.28.1: #i56715# - ULONG->sal_uInt32 for nTimeout is wrong, reversed - USHORT -> sal_uInt16 for nColId - OTableEditorCtrl::GetTotalCellWidth() returns sal_uInt32 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.47&r2=1.48 Delta lines: +1 -1 ------------------- --- TEditControl.cxx 29 Mar 2006 12:39:46 -0000 1.47 +++ TEditControl.cxx 31 Mar 2006 09:20:27 -0000 1.48 @@ -1290,7 +1290,7 @@ } //------------------------------------------------------------------------------ -ULONG OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) +sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { DBG_CHKTHIS(OTableEditorCtrl,NULL); return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth('0'); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
