summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo/undobase.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-01-13 16:06:31 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-01-13 16:06:31 +0000
commit0592e90cba3acdf5cbe8b1d3d49d239242ecab6a (patch)
treece85eb952b7c9641340f046396693a5b5a44f213 /sc/source/ui/undo/undobase.cxx
parente619d090fc9da8f304090038e8677ed2d9f1f97c (diff)
INTEGRATION: CWS dr43 (1.6.40); FILE MERGED
2005/12/21 11:53:33 nn 1.6.40.1: #125875# ensure right draw page count after undo if there was no drawing layer before
Diffstat (limited to 'sc/source/ui/undo/undobase.cxx')
-rw-r--r--sc/source/ui/undo/undobase.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index df06cd336ff4..8d5f8d5aa97c 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: undobase.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 22:38:20 $
+ * last change: $Author: rt $ $Date: 2006-01-13 17:06:31 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -201,8 +201,7 @@ void ScBlockUndo::EndUndo()
AdjustHeight();
EnableDrawAdjust( pDocShell->GetDocument(), TRUE );
- if (pDrawUndo)
- DoSdrUndoAction( pDrawUndo );
+ DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
ShowBlock();
ScSimpleUndo::EndUndo();
@@ -325,8 +324,8 @@ void ScMoveUndo::BeginUndo()
void ScMoveUndo::EndUndo()
{
- if (pDrawUndo) //@17.12.97 Reihenfolge der Fkt.s geaendert
- DoSdrUndoAction( pDrawUndo );
+ //@17.12.97 Reihenfolge der Fkt.s geaendert
+ DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() ); // #125875# must also be called when pointer is null
if (pRefUndoDoc && eMode == SC_UNDO_REFLAST)
UndoRef();