From c2724aa6a024936d5ae6082efc0e9e83908ec761 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 17 Dec 2018 17:42:31 +0100 Subject: sw_redlinehide_4b: surprising discoveries It turns out that there was a small problem in the interpretation of sw_JoinText(), or rather, its caller, SwRangeRedline::DelCopyOfSection(), which, since about OOo 3.2 and i#100466, passes in bForceJoinNext, so the result is that the first node wins always, not just for RES_BREAK/RES_PAGEDESC items. This means that pParaPropsNode and pFirstNode are the same thing really. Another little problem is that the SwAttrIter was initing the font wrongly: the relevant items are the items in the *current* node's item set on top of the item set of the paragraph style, i.e. the *first* node's style. Simple reproducer: ooo79457-1.odt Change-Id: I06ef3c1695b8f3cdbded238864a60d5eb9ce4c44 --- sw/source/core/layout/frmtool.cxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sw/source/core/layout/frmtool.cxx') diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 4cf8effa38e2..9790d77241d1 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1170,10 +1170,6 @@ void AppendObjs(const SwFrameFormats *const pTable, sal_uLong const nIndex, { AppendObjsOfNode(pTable, pNode->GetIndex(), pFrame, pPage, pDoc, &iterFirst, &iter); } - else - { - assert(pMerged->pParaPropsNode == iter->pNode); // first iteration - } pNode = iter->pNode; iterFirst = iter; } -- cgit v1.2.3