diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-22 19:27:11 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-23 10:57:32 +0200 |
| commit | 91b344b0346347ac40d2d6fa03a03e92d2e9f252 (patch) | |
| tree | 790792202d8c36e6d5a0eae8859702fe83179321 /sw/source | |
| parent | 00dfa1f2f06bcba5dcd67e8955f9a78b95f16632 (diff) | |
tdf#126340 sw_redlinehide: only move merged frames in JoinPrev
The problem was that the first and second node were not actually merged
by a redline, so moving the frames doesn't make sense.
(regression from 41d8ca9686c7c184f586e99674b443c34bfd4f33)
Change-Id: Ib401e4b0b2b207666f65c038ab5c346807bfea92
Reviewed-on: https://gerrit.libreoffice.org/76125
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/docedt.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 1388bdc1b53a..fad87aec561f 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -465,7 +465,8 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) } // delete the Node, at last! SwNode::Merge const eOldMergeFlag(pOldTextNd->GetRedlineMergeFlag()); - if (eOldMergeFlag == SwNode::Merge::First) + if (eOldMergeFlag == SwNode::Merge::First + && !pTextNd->IsCreateFrameWhenHidingRedlines()) { sw::MoveDeletedPrevFrames(*pOldTextNd, *pTextNd); } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 691c20f6490b..cced7186d49e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1126,7 +1126,8 @@ void SwTextNode::JoinPrev() pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true ); } SwNode::Merge const eOldMergeFlag(pTextNode->GetRedlineMergeFlag()); - if (eOldMergeFlag == SwNode::Merge::First) + if (eOldMergeFlag == SwNode::Merge::First + && !IsCreateFrameWhenHidingRedlines()) { sw::MoveDeletedPrevFrames(*pTextNode, *this); } |