summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-04-02 18:59:40 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-04-03 17:20:52 +0200
commit520b0e1679d7a97aa3d91cfc95ca647339da7e84 (patch)
tree3d7759bd64bbccfed2bd9d9b1b4c1fc481bb0602 /sw/source
parent166b5010b402a41b192b1659093a25acf9065fd9 (diff)
(related: tdf#130685) sw_redlinehide: fix update of pLastNode/pParaPropsNode
If you Select All, Cut then move the cursor around a bit then paste, then this happens: sw/source/core/text/txtfrm.cxx:3461: void SwTextFrame::CalcAdditionalFirstLineOffset(): Assertion `pTextNode->IsNumbered(getRootFrame()) == pTextNode->IsNumbered(nullptr)' failed. The reason is this borked MergedPara, which really only has 1 node it's listening on, but pLastNode and pParaPropsNode point to a node that is actually part of a different MergedPara now. $6 = { listener = { m_rToTell = @0x6c02700, m_vDepends = std::__debug::vector of length 1, capacity 256 = {{ <SwClient> = { m_pRegisteredIn = 0x6af5f20 }, }} }, extents = std::__debug::vector of length 0, capacity 0, mergedText = "", pParaPropsNode = 0x6d1c390, pFirstNode = 0x6af5f20, pLastNode = 0x6d1c390 } The reason is that SwContentNode::DelFrames() doesn't update these members properly; at the time when it's called for the previous pLastNode, the offending node has Merge::NonFirst set already in the call of CheckParaRedlineMerge() so it sets the wrong new pLastNode. Fix this by iterating DelFrames() loop backward. (regression from sw_redlinehide) Change-Id: I508fd25af385a25ba9ed78d71aa3d1f02a7ac7a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91597 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/docnode/node.cxx2
-rw-r--r--sw/source/core/text/redlnitr.cxx3
2 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index eacf62d4c56f..5c5b648f7cb5 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1386,6 +1386,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
break;
}
}
+ assert(pMerged->listener.IsListeningTo(pMerged->pParaPropsNode));
}
assert(GetIndex() <= pMerged->pLastNode->GetIndex());
if (this == pMerged->pLastNode)
@@ -1407,6 +1408,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
}
}
assert(pMerged->pFirstNode->GetIndex() <= pMerged->pLastNode->GetIndex());
+ assert(pMerged->listener.IsListeningTo(pMerged->pLastNode));
}
// avoid re-parenting mess (ModifyChangedHint)
pMerged->listener.EndListening(this);
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 53f614d84b68..d4be4a1d3d8d 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -276,7 +276,8 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode,
}
// unfortunately DelFrames() must be done before StartListening too,
// otherwise footnotes cannot be deleted by SwTextFootnote::DelFrames!
- for (auto iter = ++nodes.begin(); iter != nodes.end(); ++iter)
+ auto const end(--nodes.rend());
+ for (auto iter = nodes.rbegin(); iter != end; ++iter)
{
(**iter).DelFrames(rFrame.getRootFrame());
}