Kaydet (Commit) bb6ecd8b authored tarafından Michael Stahl's avatar Michael Stahl

sw: fix ~SwIndexReg assert

Not really a problem, since local aRegion's point is not used after its
node is deleted.

Change-Id: Ibeb885fb31f19b02e4c3c63e3b99d00ced756810
üst 32343a92
...@@ -751,7 +751,12 @@ namespace sw ...@@ -751,7 +751,12 @@ namespace sw
SwRedlineData aData(pFltRedline->eType, pFltRedline->nAutorNo, SwRedlineData aData(pFltRedline->eType, pFltRedline->nAutorNo,
pFltRedline->aStamp, aEmptyStr, 0); pFltRedline->aStamp, aEmptyStr, 0);
mrDoc.AppendRedline(new SwRedline(aData, aRegion), true); SwRedline *const pNewRedline(new SwRedline(aData, aRegion));
// the point node may be deleted in AppendRedline, so park
// the PaM somewhere safe
aRegion.DeleteMark();
*aRegion.GetPoint() = SwPosition(SwNodeIndex(mrDoc.GetNodes()));
mrDoc.AppendRedline(pNewRedline, true);
mrDoc.SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_NONE | nsRedlineMode_t::REDLINE_SHOW_INSERT | mrDoc.SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_NONE | nsRedlineMode_t::REDLINE_SHOW_INSERT |
nsRedlineMode_t::REDLINE_SHOW_DELETE )); nsRedlineMode_t::REDLINE_SHOW_DELETE ));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment