sw/source/core/layout/tabfrm.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dd5ec1cc8252fba9646cbfbab60b8ef6ef81a36f
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Oct 25 09:45:05 2023 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Oct 27 11:40:00 2023 +0200
Related: tdf#157590 sw floattable: avoid a bit of not needed work
See
<https://gerrit.libreoffice.org/c/core/+/158379/2#message-b9a1e9b65b5fe7bfec6a88af19032dcef73ff920>,
we only need to work out if this row has spans in case the row would
split, can skip this otherwise.
(cherry picked from commit d6527f127622f23ac529ce667fac5ff69ea33ea4)
Change-Id: Ic61dade7f42e7e43322e902a1f91d6a62bdc0ed8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158521
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index b97536d015c6..06ace548a1a0 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2609,10 +2609,10 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
auto pUpperFly = static_cast<SwFlyFrame*>(GetUpper());
bFlySplit = pUpperFly->IsFlySplitAllowed();
- if (bFlySplit)
+ if (bFlySplit && bTryToSplit)
{
- // See if this is a nested split fly where the inner
table also has
- // rowspans.
+ // This is a split fly that wants to split the row
itself. See if it's also
+ // nested. If so, we'll want to know if the row split
has rowspans.
SwTextFrame* pAnchorCharFrame =
pUpperFly->FindAnchorCharFrame();
if (pAnchorCharFrame && pAnchorCharFrame->IsInFly())
{
