Tag: cws_src680_long2int User: kendy Date: 05/11/09 07:16:58 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.cxx, TEditControl.hxx
Log: #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.44&r2=1.44.28.1 Delta lines: +4 -4 ------------------- --- TEditControl.cxx 23 Sep 2005 12:45:38 -0000 1.44 +++ TEditControl.cxx 9 Nov 2005 15:16:54 -0000 1.44.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: TEditControl.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.44.28.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:45:38 $ + * last change: $Author: kendy $ $Date: 2005/11/09 15:16:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1292,7 +1292,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'); File [changed]: TEditControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.hxx?r1=1.14.36.1&r2=1.14.36.2 Delta lines: +11 -11 --------------------- --- TEditControl.hxx 26 Oct 2005 18:07:07 -0000 1.14.36.1 +++ TEditControl.hxx 9 Nov 2005 15:16:55 -0000 1.14.36.2 @@ -4,9 +4,9 @@ * * $RCSfile: TEditControl.hxx,v $ * - * $Revision: 1.14.36.1 $ + * $Revision: 1.14.36.2 $ * - * last change: $Author: kendy $ $Date: 2005/10/26 18:07:07 $ + * last change: $Author: kendy $ $Date: 2005/11/09 15:16:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -106,7 +106,7 @@ OTableEditorCtrl* m_pOwner; public: - ClipboardInvalidator(sal_uInt32 nTimeout,OTableEditorCtrl*); + ClipboardInvalidator(ULONG nTimeout,OTableEditorCtrl*); ~ClipboardInvalidator(); protected: @@ -133,8 +133,8 @@ // return FALSE, verhindert Zellenwechsel virtual void Undo(); virtual void Redo(); - virtual String GetCellText(long nRow, USHORT nColId) const; - virtual sal_uInt32 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 ); @@ -167,18 +167,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]
