Skip to content

C
core
Kaydet (Commit) 1091f88e authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

INTEGRATION: CWS dba205b (1.15.32); FILE MERGED 

2006/08/03 09:30:03 oj 1.15.32.1: #i65810# undo corrected
üst 8ca19f5b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
dbaccess/source/ui/tabledesign/TableUndo.cxx
Dosyayı görüntüle @ 1091f88e
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: TableUndo.cxx,v $ * $RCSfile: TableUndo.cxx,v $
* *
* $Revision: 1.16 $ * $Revision: 1.17 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 07:31:23 $ * last change: $Author: ihi $ $Date: 2006-10-18 13:33:08 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -220,9 +220,7 @@ void OTableEditorTypeSelUndoAct::Undo() ...@@ -220,9 +220,7 @@ void OTableEditorTypeSelUndoAct::Undo()
{ {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Typ zuruecksetzen // Typ zuruecksetzen
pTabEdCtrl->GoToRow( m_nRow ); OFieldDescription* pFieldDesc = pTabEdCtrl->GetFieldDescr(m_nRow);
pTabEdCtrl->GoToColumnId( m_nCol );
OFieldDescription* pFieldDesc = pTabEdCtrl->GetActRow()->GetActFieldDescr();
if(pFieldDesc) if(pFieldDesc)
m_pNewType = pFieldDesc->getTypeInfo(); m_pNewType = pFieldDesc->getTypeInfo();
else else
...@@ -238,8 +236,7 @@ void OTableEditorTypeSelUndoAct::Redo() ...@@ -238,8 +236,7 @@ void OTableEditorTypeSelUndoAct::Redo()
{ {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Neuen Typ // Neuen Typ
pTabEdCtrl->GoToRow( m_nRow ); pTabEdCtrl->GoToRowColumnId( m_nRow ,m_nCol);
pTabEdCtrl->GoToColumnId( m_nCol );
pTabEdCtrl->SetCellData(m_nRow,m_nCol,m_pNewType); pTabEdCtrl->SetCellData(m_nRow,m_nCol,m_pNewType);
OTableEditorUndoAct::Redo(); OTableEditorUndoAct::Redo();
...@@ -295,6 +292,7 @@ void OTableEditorDelUndoAct::Undo() ...@@ -295,6 +292,7 @@ void OTableEditorDelUndoAct::Undo()
pOriginalRows->insert( pOriginalRows->begin()+nPos,pNewOrigRow); pOriginalRows->insert( pOriginalRows->begin()+nPos,pNewOrigRow);
} }
pTabEdCtrl->DisplayData(pTabEdCtrl->GetCurRow());
pTabEdCtrl->Invalidate(); pTabEdCtrl->Invalidate();
OTableEditorUndoAct::Undo(); OTableEditorUndoAct::Undo();
} }
...@@ -314,6 +312,7 @@ void OTableEditorDelUndoAct::Redo() ...@@ -314,6 +312,7 @@ void OTableEditorDelUndoAct::Redo()
pOriginalRows->erase( pOriginalRows->begin()+nPos ); pOriginalRows->erase( pOriginalRows->begin()+nPos );
} }
pTabEdCtrl->DisplayData(pTabEdCtrl->GetCurRow());
pTabEdCtrl->Invalidate(); pTabEdCtrl->Invalidate();
OTableEditorUndoAct::Redo(); OTableEditorUndoAct::Redo();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment