diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-11 23:02:05 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-11 22:24:02 +0100 |
| commit | 7eebdd24ee72a8deef869eca53103094632aeb59 (patch) | |
| tree | f3ee02967333524148e76fa4ae5268822c961a4f /sw/source/core/layout/calcmove.cxx | |
| parent | 50519e036a2707aca59cc8a7b58c4fdd7aeff580 (diff) | |
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I08ea67c1b51ee04258ce7769bfe9d97a1cb46b22
Reviewed-on: https://gerrit.libreoffice.org/63268
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 9594b91ab536..72d74ed63974 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1701,6 +1701,8 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) nullptr != GetNextCellLeaf() ) bDontMoveMe = false; + assert(bMoveable); + if ( bDontMoveMe && aRectFnSet.GetHeight(getFrameArea()) > aRectFnSet.GetHeight(GetUpper()->getFramePrintArea()) ) { @@ -1725,7 +1727,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) * Exception: If we sit in FormatWidthCols, we must not ignore * the attributes. */ - else if ( !bFootnote && bMoveable && + else if ( !bFootnote && ( !bFly || !FindFlyFrame()->IsColLocked() ) && ( !bSct || !FindSctFrame()->IsColLocked() ) ) bMoveOrFit = true; |