strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i97384#: apply patch from majun51

Browse source
This commit is contained in:
Michael Stahl 2009-10-09 11:24:38 +02:00
parent 2a859bcf2f
commit c3b681c70b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sw/source/filter/basflt/shellio.cxx
View file

@ -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--;