[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/layout/fly.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dba206bd9b7e219cd8531641c6ff6c158446b2c2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Sep 28 09:03:27 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:48:41 2023 +0200

    sw floattable: maintain the invariant that fly height is at least MINFLY
    
    Fixes these warnings on loading 
sw/qa/core/layout/data/floattable-in-inlinetable.docx:
    
    warn:legacy.osl:6908:6908:sw/source/core/layout/flylay.cxx:703: 
<SwFlyFreeFrame::CheckClip(..)> - fly frame has negative height now.
    warn:legacy.osl:6908:6908:sw/source/core/layout/flylay.cxx:295: 
SwFlyFreeFrame::Format(), flipping Fly.
    
    (cherry picked from commit 25b8fdd3b939a221ba00ca37fbf89adaf893aab7)
    
    Change-Id: I20d01e3289ea597a5b5f4ee43a5e1b892a618648
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157394
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c3db26950461..e0b9d1837e67 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1442,7 +1442,7 @@ void SwFlyFrame::Format( vcl::RenderContext* 
/*pRenderContext*/, const SwBorderA
                 SwTwips nDeadline = GetFlyAnchorBottom(this, *pAnchor);
                 SwTwips nTop = aRectFnSet.GetTop(getFrameArea());
                 SwTwips nBottom = aRectFnSet.GetTop(getFrameArea()) + 
nRemaining;
-                if (nBottom > nDeadline)
+                if (nBottom > nDeadline && nDeadline > nTop)
                 {
                     nRemaining = nDeadline - nTop;
                 }