Tag: cws_src680_dba205b User: oj Date: 2006/08/03 02:30:06 Modified: dba/dbaccess/source/ui/tabledesign/TEditControl.hxx dba/dbaccess/source/ui/tabledesign/TableUndo.cxx
Log: #i65810# undo corrected 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.18&r2=1.18.34.1 Delta lines: +4 -4 ------------------- --- TEditControl.hxx 20 Jun 2006 03:32:20 -0000 1.18 +++ TEditControl.hxx 3 Aug 2006 09:30:03 -0000 1.18.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: TEditControl.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.34.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:32:20 $ + * last change: $Author: oj $ $Date: 2006/08/03 09:30:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,6 +186,7 @@ BOOL IsCopyAllowed( long nRow = -1 ); BOOL IsPasteAllowed( long nRow = -1 ); BOOL IsReadOnly(); + OFieldDescription* GetFieldDescr( long nRow ); // window overloads virtual long PreNotify( NotifyEvent& rNEvt ); @@ -212,7 +213,6 @@ INT32 HasFieldName( const String& rFieldName ); String GenerateName( const String& rName ); BOOL SetDataPtr( long nRow ); - OFieldDescription* GetFieldDescr( long nRow ); void SetEditMode( EEditMode eMode ){ eEditMode = eMode; } EEditMode GetEditMode(){ return eEditMode; } File [changed]: TableUndo.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableUndo.cxx?r1=1.15&r2=1.15.32.1 Delta lines: +7 -8 ------------------- --- TableUndo.cxx 20 Jun 2006 03:33:51 -0000 1.15 +++ TableUndo.cxx 3 Aug 2006 09:30:03 -0000 1.15.32.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableUndo.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.32.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:33:51 $ + * last change: $Author: oj $ $Date: 2006/08/03 09:30:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -217,9 +217,7 @@ { ////////////////////////////////////////////////////////////////////// // Typ zuruecksetzen - pTabEdCtrl->GoToRow( m_nRow ); - pTabEdCtrl->GoToColumnId( m_nCol ); - OFieldDescription* pFieldDesc = pTabEdCtrl->GetActRow()->GetActFieldDescr(); + OFieldDescription* pFieldDesc = pTabEdCtrl->GetFieldDescr(m_nRow); if(pFieldDesc) m_pNewType = pFieldDesc->getTypeInfo(); else @@ -235,8 +233,7 @@ { ////////////////////////////////////////////////////////////////////// // Neuen Typ - pTabEdCtrl->GoToRow( m_nRow ); - pTabEdCtrl->GoToColumnId( m_nCol ); + pTabEdCtrl->GoToRowColumnId( m_nRow ,m_nCol); pTabEdCtrl->SetCellData(m_nRow,m_nCol,m_pNewType); OTableEditorUndoAct::Redo(); @@ -292,6 +289,7 @@ pOriginalRows->insert( pOriginalRows->begin()+nPos,pNewOrigRow); } + pTabEdCtrl->DisplayData(pTabEdCtrl->GetCurRow()); pTabEdCtrl->Invalidate(); OTableEditorUndoAct::Undo(); } @@ -311,6 +309,7 @@ pOriginalRows->erase( pOriginalRows->begin()+nPos ); } + pTabEdCtrl->DisplayData(pTabEdCtrl->GetCurRow()); pTabEdCtrl->Invalidate(); OTableEditorUndoAct::Redo(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
