Kaydet (Commit) c768c144 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide: trivial conversions in softpagebreak.cxx

Still a bit TODO here wrt. finding the frame from every node...

Change-Id: Icff33d2fae3afee77c4329db0938b444f0e47537
üst 245ce565
......@@ -79,7 +79,11 @@ void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
if( pFirst2 == pFrame )
{ // Here we are: a first content inside a cell
// inside the splitted row => soft page break
rBreak.insert( pFrame->GetOfst() );
auto const pos(pFrame->MapViewToModel(pFrame->GetOfst()));
if (pos.first == this)
{
rBreak.insert(pos.second);
}
break;
}
pCell = pCell->GetNext();
......@@ -88,7 +92,14 @@ void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
}
else // No soft page break if there's a "hard" page break attribute
if( pFirst2 == pFrame && !pFrame->IsPageBreak( true ) )
rBreak.insert( pFrame->GetOfst() );
{
auto const pos(pFrame->MapViewToModel(pFrame->GetOfst()));
if (pos.first == this)
{ // in the !Show case, we have to iterate over the merged
// SwTextFrame for every node
rBreak.insert(pos.second);
}
}
}
}
}
......
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