User: ihi Date: 2006/10/18 06:33:10 Modified: dba/dbaccess/source/ui/tabledesign/TableUndo.cxx
Log: INTEGRATION: CWS dba205b (1.15.32); FILE MERGED 2006/08/03 09:30:03 oj 1.15.32.1: #i65810# undo corrected File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableUndo.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableUndo.cxx?r1=1.16&r2=1.17 Delta lines: +4 -5 ------------------- --- TableUndo.cxx 17 Sep 2006 07:31:23 -0000 1.16 +++ TableUndo.cxx 18 Oct 2006 13:33:08 -0000 1.17 @@ -220,9 +220,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 @@ -238,8 +236,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(); @@ -295,6 +292,7 @@ pOriginalRows->insert( pOriginalRows->begin()+nPos,pNewOrigRow); } + pTabEdCtrl->DisplayData(pTabEdCtrl->GetCurRow()); pTabEdCtrl->Invalidate(); OTableEditorUndoAct::Undo(); } @@ -314,6 +312,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]
