sw/source/core/doc/docedt.cxx | 3 ++- sw/source/core/txtnode/ndtxt.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 3a8bcb6f330dcf6ba6846c61a18769dae14259a9 Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Mon Jul 22 19:27:11 2019 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Mon Aug 12 13:46:32 2019 +0200 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.st...@cib.de> (cherry picked from commit 91b344b0346347ac40d2d6fa03a03e92d2e9f252) Reviewed-on: https://gerrit.libreoffice.org/76150 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 447d52dffaa2fcc8a78ac87fbd8cf543c52888e5) Reviewed-on: https://gerrit.libreoffice.org/77345 Tested-by: Michael Stahl <michael.st...@cib.de> diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index f1cfd3cfeaa0..e186e10cbc8f 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -413,7 +413,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 eea82d1aa324..dcaf2047ed3a 100755 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1127,7 +1127,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); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits