diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:32:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:32:09 +0000 |
| commit | 873f0dc85a8304877187ada9f85766cc71d421b0 (patch) | |
| tree | 5f3a884145feded3671932abfce5008b4ee7e181 /sc/source/ui/undo/undodat.cxx | |
| parent | 58646559304cf12be6558645e64f3ee7adde4cf0 (diff) | |
INTEGRATION: CWS pagefields (1.2.336); FILE MERGED
2003/12/05 13:57:58 nn 1.2.336.1: #i22164# page field handling
Diffstat (limited to 'sc/source/ui/undo/undodat.cxx')
| -rw-r--r-- | sc/source/ui/undo/undodat.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 7232f83a48bb..e5809aa10c49 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undodat.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-12-14 14:32:39 $ + * last change: $Author: hr $ $Date: 2004-04-13 12:32:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1735,12 +1735,13 @@ BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, ScDocument* pOldDoc, ScDocument* pNewDoc, - const ScDPObject* pOldObj, const ScDPObject* pNewObj ) : + const ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bMove ) : ScSimpleUndo( pNewDocShell ), pOldDPObject( NULL ), pNewDPObject( NULL ), pOldUndoDoc( pOldDoc ), - pNewUndoDoc( pNewDoc ) + pNewUndoDoc( pNewDoc ), + bAllowMove( bMove ) { if (pOldObj) pOldDPObject = new ScDPObject( *pOldObj ); @@ -1811,6 +1812,7 @@ void __EXPORT ScUndoDataPilot::Undo() if (pData) pDocObj->SetSaveData(*pData); pDocObj->SetOutRange( pOldDPObject->GetOutRange() ); + pOldDPObject->WriteTempDataTo( *pDocObj ); } else { @@ -1869,7 +1871,7 @@ void __EXPORT ScUndoDataPilot::Redo() } ScDBDocFunc aFunc( *pDocShell ); - aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE ); // no new undo action + aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action EndRedo(); } |