diff options
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 3ddc6c4e54cb..f9a838bad1c5 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -846,16 +846,22 @@ void MoveDeletedPrevFrames(SwTextNode & rDeletedPrev, SwTextNode & rNode) SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(rDeletedPrev); for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next()) { - frames.push_back(pFrame); + if (pFrame->getRootFrame()->IsHideRedlines()) + { + frames.push_back(pFrame); + } } { auto frames2(frames); SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIt(rNode); for (SwTextFrame* pFrame = aIt.First(); pFrame; pFrame = aIt.Next()) { - auto const it(std::find(frames2.begin(), frames2.end(), pFrame)); - assert(it != frames2.end()); - frames2.erase(it); + if (pFrame->getRootFrame()->IsHideRedlines()) + { + auto const it(std::find(frames2.begin(), frames2.end(), pFrame)); + assert(it != frames2.end()); + frames2.erase(it); + } } assert(frames2.empty()); } |