User: vg Date: 06/03/31 01:20:41 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.hxx
Log: INTEGRATION: CWS long2int (1.14.36); FILE MERGED 2005/11/09 15:16:55 kendy 1.14.36.2: #i56715# - ULONG->sal_uInt32 for nTimeout is wrong, reversed - USHORT -> sal_uInt16 for nColId - OTableEditorCtrl::GetTotalCellWidth() returns sal_uInt32 2005/10/26 18:07:07 kendy 1.14.36.1: #i56715# Trivial long/ULONG -> sal_Int32/sal_uInt32 patches extracted from ooo64bit02 CWS. File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.hxx?r1=1.15&r2=1.16 Delta lines: +8 -8 ------------------- --- TEditControl.hxx 29 Mar 2006 12:39:58 -0000 1.15 +++ TEditControl.hxx 31 Mar 2006 09:20:38 -0000 1.16 @@ -132,8 +132,8 @@ // return FALSE, verhindert Zellenwechsel virtual void Undo(); virtual void Redo(); - virtual String GetCellText(long nRow, USHORT nColId) const; - virtual ULONG GetTotalCellWidth(long nRow, USHORT nColId); + virtual String GetCellText(long nRow, sal_uInt16 nColId) const; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual void CopyRows(); virtual void InsertRows( long nRow ); @@ -166,18 +166,18 @@ void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist) - virtual void SetData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ); - virtual void SetData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rSaveData ); - virtual ::com::sun::star::uno::Any GetData( long nRow, USHORT nColId ); - virtual void SetControlText( long nRow, USHORT nColId, const String& rText ); - virtual String GetControlText( long nRow, USHORT nColId ); + virtual void SetData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); + virtual void SetData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ); + virtual ::com::sun::star::uno::Any GetData( long nRow, sal_uInt16 nColId ); + virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ); + virtual String GetControlText( long nRow, sal_uInt16 nColId ); virtual OTableDesignView* GetView() const; ::std::vector<OTableRow*>* GetRowList(){ return m_pRowList; } OTableRow* GetActRow(){ return pActRow; } - void CellModified( long nRow, USHORT nColId ); + void CellModified( long nRow, sal_uInt16 nColId ); void SetReadOnly( BOOL bRead=TRUE ); virtual void Init(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
