diff options
Diffstat (limited to 'sw/source/core')
| -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 9fceec0533a6..2e4d132a838e 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 c8719a4316d6..1f804ebbe55e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1128,7 +1128,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); } |