diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-17 17:42:31 +0100 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-17 18:04:06 +0100 |
commit | c2724aa6a024936d5ae6082efc0e9e83908ec761 (patch) | |
tree | b37771e6bd0277a44790c9b87e2796976ede63c3 /sw/source/core/text/itratr.hxx | |
parent | 52f4baffb875232f155874a63e383da436c10bff (diff) |
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
Diffstat (limited to 'sw/source/core/text/itratr.hxx')
-rw-r--r-- | sw/source/core/text/itratr.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index 959436609608..2dddd1265d8c 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -65,7 +65,8 @@ private: void SeekFwd(sal_Int32 nOldPos, sal_Int32 nNewPos); void SetFnt( SwFont* pNew ) { m_pFont = pNew; } - void InitFontAndAttrHandler(SwTextNode const& rTextNode, + void InitFontAndAttrHandler( + SwTextNode const& rPropsNode, SwTextNode const& rTextNode, OUString const& rText, bool const* pbVertLayout); protected: |