diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:10:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:10:48 +0000 |
| commit | 14f03f37013b9036bcbbece778260c78fc65c104 (patch) | |
| tree | c4ad33c4e85038752df2b68b27a55a3a2f896d4f /sw/source/core/edit/edundo.cxx | |
| parent | bbadf3ebed0b90d590d3efa8c527e69c7c5f88f6 (diff) | |
INTEGRATION: CWS writercorehandoff (1.7.776); FILE MERGED
2006/07/27 14:40:44 fme 1.7.776.4: RESYNC: (1.8-1.9); FILE MERGED
2005/09/28 14:00:57 tra 1.7.776.3: #i50348#
2005/09/13 13:36:02 tra 1.7.776.2: RESYNC: (1.7-1.8); FILE MERGED
2005/08/31 12:50:53 tra 1.7.776.1: #i50348# Introducing IDocumentRedlineAccess interface
Diffstat (limited to 'sw/source/core/edit/edundo.cxx')
| -rw-r--r-- | sw/source/core/edit/edundo.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 5d3b71b08fb7..c53594bd6441 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -4,9 +4,9 @@ * * $RCSfile: edundo.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2006-07-25 12:30:24 $ + * last change: $Author: hr $ $Date: 2006-08-14 16:10:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,6 @@ * ************************************************************************/ - #pragma hdrstop #ifndef _SVDVIEW_HXX //autogen wg. SdrView @@ -99,7 +98,7 @@ BOOL SwEditShell::Undo( USHORT nUndoId, USHORT nCnt ) // JP 02.04.98: Cursor merken - beim Auto-Format/-Korrektur // soll dieser wieder an die Position - USHORT nLastUndoId = GetDoc()->GetUndoIds(); + USHORT nLastUndoId = GetDoc()->GetUndoIds(NULL, NULL); BOOL bRestoreCrsr = 1 == nCnt && ( UNDO_AUTOFORMAT == nLastUndoId || UNDO_AUTOCORRECT == nLastUndoId ); Push(); @@ -108,7 +107,7 @@ BOOL SwEditShell::Undo( USHORT nUndoId, USHORT nCnt ) // Erkennung darf nur noch fuer die neue "Box" erfolgen! ClearTblBoxCntnt(); - SwRedlineMode eOld = GetDoc()->GetRedlineMode(); + IDocumentRedlineAccess::RedlineMode_t eOld = GetDoc()->GetRedlineMode(); SwUndoIter aUndoIter( GetCrsr(), nUndoId ); while( nCnt-- ) @@ -194,7 +193,7 @@ USHORT SwEditShell::Redo( USHORT nCnt ) // Erkennung darf nur noch fuer die neue "Box" erfolgen! ClearTblBoxCntnt(); - SwRedlineMode eOld = GetDoc()->GetRedlineMode(); + IDocumentRedlineAccess::RedlineMode_t eOld = GetDoc()->GetRedlineMode(); SwUndoIter aUndoIter( GetCrsr(), 0 ); while( nCnt-- ) |