From c3b681c70b805eb4a05f39f6af26ae6f2a30db8f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 9 Oct 2009 11:24:38 +0200
Subject: #i97384#: apply patch from majun51

---
 sw/source/filter/basflt/shellio.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index aaa640de0ef4..75551f2f3b8d 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -158,7 +158,6 @@ ULONG SwReader::Read( const Reader& rOptions )
     SwNodeIndex aSplitIdx( pDoc->GetNodes() );
 
     RedlineMode_t eOld = pDoc->GetRedlineMode();
-    pDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
 
     // Array von FlyFormaten
     SwSpzFrmFmts aFlyFrmArr;
@@ -170,6 +169,8 @@ ULONG SwReader::Read( const Reader& rOptions )
         if( bSaveUndo )
             pUndo = new SwUndoInsDoc( *pPam );
 
+        pDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
+
         SwPaM* pUndoPam = 0;
         if( bDocUndo || pCrsr )
         {
@@ -190,8 +191,12 @@ ULONG SwReader::Read( const Reader& rOptions )
         xub_StrLen nEndCntnt = pCNd ? pCNd->Len() - nSttCntnt : 0;
         SwNodeIndex aEndPos( pPam->GetPoint()->nNode, 1 );
 
+        pDoc->SetRedlineMode_intern( eOld );
+
         nError = po->Read( *pDoc, GetBaseURL(), *pPam, aFileName );
 
+        pDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
+
         if( !IsError( nError ))     // dann setzen wir das Ende mal richtig
         {
             aEndPos--;
-- 
cgit