diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2024-03-12 16:21:57 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-03-13 09:21:48 +0100 |
commit | 7d3b439de357c8e97c0a73f6f63e67ec980e432d (patch) | |
tree | e2eb904db60f2ac3ea484ff6e88b3c81ee4cb18b /sw/source/core/layout/tabfrm.cxx | |
parent | e1bcdbc6ee0899f3cb915c7a64a1c3b0d42ba977 (diff) |
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 <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 10d1b163777e..edb10beb35c6 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()) { |