Kaydet (Commit) 2191f646 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide: set node merge flag in CheckParaRedlineMerge

Change-Id: Ie11096ce9c3d62fbe54dc53954caf6665c374b12
üst 3e724847
...@@ -82,8 +82,17 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode) ...@@ -82,8 +82,17 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode)
} }
if (&pEnd->nNode.GetNode() != pNode) if (&pEnd->nNode.GetNode() != pNode)
{ {
if (pNode == &rTextNode)
{
pNode->SetRedlineMergeFlag(SwNode::Merge::First);
} // else: was already set before
for (sal_uLong j = pNode->GetIndex() + 1; j < pEnd->nNode.GetIndex(); ++j)
{
pNode->GetNodes()[j]->SetRedlineMergeFlag(SwNode::Merge::Hidden);
}
pNode = pEnd->nNode.GetNode().GetTextNode(); pNode = pEnd->nNode.GetNode().GetTextNode();
assert(pNode); assert(pNode);
pNode->SetRedlineMergeFlag(SwNode::Merge::NonFirst);
} }
nLastEnd = pEnd->nContent.GetIndex(); nLastEnd = pEnd->nContent.GetIndex();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment