summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-11-05 11:51:00 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-11-10 19:47:00 +0100
commit211052a5182674606e32ca89efdbe6f2216d0c9d (patch)
tree64414efc6e4d562d87532e85908709050c2ca562
parent4bb4a3b2cc0b71342ef780876173c88720e1af90 (diff)
sw_redlinehide_3: move assert in SwContentNode::DelFrames()
This is happening in MoveParagraph; the UpdateMergedParaForDelete will reset the pParaPropsNode pointer so move assert below that. Change-Id: I31069578a9bfdb05f01ea778bbe9e9ae43c865c6
-rw-r--r--sw/source/core/docnode/node.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 247744c37201..7b59dad4ad6d 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1366,8 +1366,6 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
{
if (this != pMerged->pFirstNode)
{
- // pointer should have been updated to a different node
- assert(this != pMerged->pParaPropsNode);
// SwNodes::RemoveNode iterates *backwards* - so
// ensure there are no more extents pointing to this
// node as SwFrame::InvalidatePage() will access them.
@@ -1375,6 +1373,8 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
// because that would access deleted wrong-lists
sw::UpdateMergedParaForDelete(*pMerged, true,
*static_cast<SwTextNode*>(this), 0, Len());
+ // pointer should have been updated to a different node
+ assert(this != pMerged->pParaPropsNode);
if (this == pMerged->pLastNode)
{
pMerged->pLastNode = GetNodes()[GetIndex()-1]->GetTextNode();