diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-01 21:53:39 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-08 21:51:36 +0200 |
| commit | 7e6a9bfd1f2cd14f2b7504ad4573c37f78d6ee29 (patch) | |
| tree | ff3817fa8fea9fca1f2e3962808f589ef04f6a6f /sw/source/core/layout/calcmove.cxx | |
| parent | 0fd4d37e88b6b8384c1e3885461a1c81995fa3e8 (diff) | |
sw_redlinehide: refactor SwFlowFrame::IsKeep()
This thing uses 2 items, a normal one and RES_BREAK, so they need to be
passed in separately, a merged text frame does not necessarily have any
item set with the matching items.
Change-Id: I5e50ac60137ba8d94adeaee2ef015551d8a3bdd8
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index c00b5efe1758..2b56272bf49c 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1214,7 +1214,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) pNotify->SetBordersJoinedWithPrev(); } - const bool bKeep = IsKeep( rAttrs.GetAttrSet() ); + const bool bKeep = IsKeep(rAttrs.GetAttrSet().GetKeep(), GetBreakItem()); SwSaveFootnoteHeight *pSaveFootnote = nullptr; if ( bFootnote ) @@ -2092,7 +2092,7 @@ bool SwContentFrame::WouldFit_( SwTwips nSpace, } } - if ( bRet && !bSplit && pFrame->IsKeep( rAttrs.GetAttrSet() ) ) + if (bRet && !bSplit && pFrame->IsKeep(rAttrs.GetAttrSet().GetKeep(), GetBreakItem())) { if( bTstMove ) { |