sw/source/core/layout/tabfrm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 6a9feb0bba19bcff87e0e1a16fcd03ad3a390dfa Author: Michael Stahl <[email protected]> AuthorDate: Tue Mar 12 16:21:57 2024 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Mar 19 18:51:46 2024 +0100 tdf#157241 sw: layout: inconsistent conditions in lcl_RecalcSplitLine() A mistake, when checking before the condition is "if (pTab == &rTab)" but when checking after it is "if (pTab)" - the latter is correct as the former is checked *inside* the block, after resolving to top-level table. This caused erroneously setting rIsFootnoteGrowth = true in SwTabFrame::MakeAll() of tab 939 in the bugdoc, when in fact the footnote container shrunk from 5 to 2 footnotes. (regression from commit c303981cfd95ce1c3881366023d5495ae2edce97) Change-Id: Ib4cad9fef0e500ebe7a3636c2371a4108b32fb5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164717 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 7d3b439de357c8e97c0a73f6f63e67ec980e432d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164733 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 3ea0c848b490f5b6f5f3860a9036ce25754a1f17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164740 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Xisco Fauli <[email protected]> diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 8c49106364dc..c4a742c0373d 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -667,7 +667,7 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame& rFollowLine, { SwContentFrame const*const pAnchor = pFootnote->GetRef(); SwTabFrame const* pTab = pAnchor->FindTabFrame(); - if (pTab == &rTab) + if (pTab) { while (pTab->GetUpper()->IsInTab()) {
