diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-16 11:35:05 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:08:55 +0200 |
| commit | 27dac4746a286ab58ffe4663cd072aefc343de32 (patch) | |
| tree | ebad947e43547d5bc00c7647c9561be81b6b0f9a | |
| parent | af5b8e04292b6811c0e6535bd061ccc023675cce (diff) | |
sw_redlinehide_2: CheckParaRedlineMerge must also mark...
... first node as not merged when there are redlines but not spanning
nodes.
Change-Id: Ieb6a5775a1f6a22874e622b10b245b7e8d61a62c
| -rw-r--r-- | sw/source/core/text/redlnitr.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index f7225e8f0b8a..b7d5b09a13d4 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -118,12 +118,15 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode, } nLastEnd = pEnd->nContent.GetIndex(); } - if (!bHaveRedlines) + if (pNode == &rTextNode) { - if (pNode->GetRedlineMergeFlag() != SwNode::Merge::None) + if (rTextNode.GetRedlineMergeFlag() != SwNode::Merge::None) { - pNode->SetRedlineMergeFlag(SwNode::Merge::None); + rTextNode.SetRedlineMergeFlag(SwNode::Merge::None); } + } + if (!bHaveRedlines) + { return nullptr; } if (nLastEnd != pNode->Len()) |