sw/source/core/text/frmform.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c513d0785dccfb55dd0cf818dcf682b1d752ed52
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Aug 29 10:13:51 2024 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 30 11:03:48 2024 +0200
sw: call HasFullPageFly() later in SwTextFrame::FormatAdjust()
Suggested at
<https://gerrit.libreoffice.org/c/core/+/172562/2#message-01333d4017922b8d2c834519ea7d94517110112a>,
the other conditions are trivial to check, so best if we do the
expensive condition only at the end.
(cherry picked from commit 710fa4e68cc134d9970a6d0c034a84c3419be14a)
Change-Id: I54e4914095e2e06cf162e340754ba7859f0903d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172624
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index cbf6945e16e8..482f964bce45 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1259,7 +1259,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
}
}
- if (nNew && HasFullPageFly(this) && nEnd == TextFrameIndex(0) &&
!bEmptyWithSplitFly)
+ if (nNew && nEnd == TextFrameIndex(0) && !bEmptyWithSplitFly &&
HasFullPageFly(this))
{
// We intended to split at start, due to an anchored object which
would use all space on the
// current page. It makes no sense to split & move all text of the
frame forward: the
