diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 16:07:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 16:07:31 +0000 |
| commit | 5779c7321e55e35814eacb600cad181a51283dbd (patch) | |
| tree | 766ed1e6a924fafe6e572d9e05a125d31c35fa7b | |
| parent | f760ebe7cd182d8bcda0ef6e25ea2c984022f437 (diff) | |
INTEGRATION: CWS dr43 (1.9.40); FILE MERGED
2005/12/21 11:53:40 nn 1.9.40.1: #125875# ensure right draw page count after undo if there was no drawing layer before
| -rw-r--r-- | sc/source/ui/undo/undocell.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index ba5b62e99..d4ee26d4e 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: undocell.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:39:19 $ + * last change: $Author: rt $ $Date: 2006-01-13 17:07:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -872,10 +872,9 @@ void __EXPORT ScUndoNote::Undo() { BeginUndo(); - if (pDrawUndo) - DoSdrUndoAction(pDrawUndo); - ScDocument* pDoc = pDocShell->GetDocument(); + DoSdrUndoAction(pDrawUndo, pDoc); + ScPostIt aNote(pDoc); pDoc->GetNote( aPos.Col(), aPos.Row(), aPos.Tab(), aNote ); aNote.SetShown( !bIsShow ); @@ -888,8 +887,7 @@ void __EXPORT ScUndoNote::Redo() { BeginRedo(); - if (pDrawUndo) - RedoSdrUndoAction(pDrawUndo); + RedoSdrUndoAction(pDrawUndo); ScDocument* pDoc = pDocShell->GetDocument(); ScPostIt aNote(pDoc); @@ -1026,10 +1024,8 @@ void __EXPORT ScUndoDetective::Undo() { BeginUndo(); - if (pDrawUndo) - DoSdrUndoAction(pDrawUndo); - ScDocument* pDoc = pDocShell->GetDocument(); + DoSdrUndoAction(pDrawUndo, pDoc); if (bIsDelete) { @@ -1063,8 +1059,7 @@ void __EXPORT ScUndoDetective::Redo() { BeginRedo(); - if (pDrawUndo) - RedoSdrUndoAction(pDrawUndo); + RedoSdrUndoAction(pDrawUndo); ScDocument* pDoc = pDocShell->GetDocument(); |