summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2002-02-22 12:58:00 +0000
committerjp <jp@openoffice.org>2002-02-22 12:58:00 +0000
commitf3bd0e40ec53526fb64860a5fb3f0907176c61a3 (patch)
tree94cce98024ecfb2d58b9c252245e1d3f28f8cf33 /sw
parentc55cfd6a24e0e11ae49d3076e6c4db883f6a49ca (diff)
Bug #95442#: for add Undos, the correct RedlineMode must be set
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/basflt/shellio.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 29297c79c9be..7457d0899228 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: shellio.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: mib $ $Date: 2001-12-06 13:07:58 $
+ * last change: $Author: jp $ $Date: 2002-02-22 13:58:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -345,7 +345,11 @@ ULONG SwReader::Read( const Reader& rOptions )
else
{
if( bSaveUndo )
+ {
+ pDoc->SetRedlineMode_intern( eOld );
pDoc->AppendUndo( new SwUndoInsLayFmt( pFrmFmt ) );
+ pDoc->SetRedlineMode_intern( REDLINE_IGNORE );
+ }
if( pFrmFmt->GetDepends() )
{
// beim Insert legen Draw-Objecte einen Frame an
@@ -381,8 +385,10 @@ ULONG SwReader::Read( const Reader& rOptions )
}
if( bSaveUndo )
{
+ pDoc->SetRedlineMode_intern( eOld );
pUndo->SetInsertRange( *pUndoPam, FALSE );
pDoc->AppendUndo( pUndo );
+ pDoc->SetRedlineMode_intern( REDLINE_IGNORE );
}
delete pUndoPam;
@@ -416,7 +422,11 @@ ULONG SwReader::Read( const Reader& rOptions )
{
pDoc->DoUndo( bDocUndo );
if( bSaveUndo )
+ {
+ pDoc->SetRedlineMode_intern( eOld );
pDoc->EndUndo( UNDO_INSDOKUMENT );
+ pDoc->SetRedlineMode_intern( REDLINE_IGNORE );
+ }
}
// Wenn der Pam nur fuers Lesen konstruiert wurde, jetzt zerstoeren.