Kaydet (Commit) 8808970b authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Thorsten Behrens

sw_redlinehide_4a: MoveDeletedPrevFrames() should only move

... frames from a layout with hidden redlines.

Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515
(cherry picked from commit c1d7cc39)
üst 9eb63d8b
......@@ -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());
}
......
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