summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-05 12:45:24 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-05 12:46:55 +0100
commita7d2885bf8b6d717b441f6cc9215e7ae2700b82a (patch)
tree7b0edcb2669f277ced4bbfd2390b24483900e9c1
parent7d22ed707aaf098c996f747ee5d4bbdae506f976 (diff)
sw_redlinehide_4b: fix wrong assert in AppendObjs()
Clearly this is wrong, the first node might be deleted; triggered e.g. by ooo69593-1.odt. Change-Id: I8f491372fcc375e68f2f7611924d8d4c7f673f17
-rw-r--r--sw/source/core/layout/frmtool.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index e379c01c8375..f1c11bb23103 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1171,7 +1171,7 @@ void AppendObjs(const SwFrameFormats *const pTable, sal_uLong const nIndex,
}
else
{
- assert(nIndex == iter->pNode->GetIndex()); // first iteration
+ assert(pMerged->pParaPropsNode == iter->pNode); // first iteration
}
pNode = iter->pNode;
iterFirst = iter;