diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-12 13:19:32 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-12 16:29:21 +0200 |
| commit | 972040a6b13951469f0490d3d2aeba147ec22244 (patch) | |
| tree | af3311ed3019bb9168ddf42ee2c04716247dcc1c /sw | |
| parent | 52f0f0a495105ace4819dd86796786795933a1c3 (diff) | |
sw: fix assert in SwTextFrame::RegisterToNode() on ooo33427-1.sxw
If we now allow deleting the first node from
SwRangeRedline::DelCopyOfSection(), it will trigger if there's a insert
redline ending on the same empty node where a delete redline starts.
(somehow this was missing in beec1594587d0bf1ea2268f9a435c948b5580278)
Change-Id: I83ce5bdac983873b89536e06d1dc0d7d8fb17ada
Reviewed-on: https://gerrit.libreoffice.org/77351
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 043752c6d9e9..66b133081cc7 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -448,10 +448,11 @@ SwContentFrame::~SwContentFrame() void SwTextFrame::RegisterToNode(SwTextNode & rNode, bool const isForceNodeAsFirst) { if (isForceNodeAsFirst && m_pMergedPara) - { // nothing registered here, in particular no redlines + { // nothing registered here, in particular no delete redlines (insert + // redline might end on empty node where delete rl starts, should be ok) assert(m_pMergedPara->pFirstNode->GetIndex() + 1 == rNode.GetIndex()); assert(rNode.GetDoc()->getIDocumentRedlineAccess().GetRedlinePos( - *m_pMergedPara->pFirstNode, RedlineType::Any) == SwRedlineTable::npos); + *m_pMergedPara->pFirstNode, RedlineType::Delete) == SwRedlineTable::npos); } assert(&rNode != GetDep()); assert(!m_pMergedPara |