diff options
| author | Michael Stahl <mst@openoffice.org> | 2009-10-09 11:24:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2009-10-09 11:24:38 +0200 |
| commit | c3b681c70b805eb4a05f39f6af26ae6f2a30db8f (patch) | |
| tree | 5f1ca14c2503a5cf3a2fbc9d22f7ee0e15a1724d | |
| parent | 2a859bcf2fcfa827aa9a7565133897fe71129b50 (diff) | |
#i97384#: apply patch from majun51
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
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--; |