summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/tabfrm.cxx
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2020-08-06 14:46:08 +0200
committerLászló Németh <nemeth@numbertext.org>2020-08-07 09:32:23 +0200
commitdb3191f408fa2d04bf5870ea2c117e75d410ab5f (patch)
treebc1ad0ee8d063d77fba90b51a7ce8a9d9edf6e1e /sw/source/core/layout/tabfrm.cxx
parente87fb75453b26f8f452f4db1130f672a681eaf71 (diff)
tdf#130639 sw layout: fix table position
at fallback "switch off repeating header" by removing temporary page break immediately. Follow-up of commit f7e071a00542c414a7e9d7bcf4434d908f225e59 (tdf#88496 DOCX: disable long repeating table header). Change-Id: I3ae62456fd50f3f3fa25bfea5326a8eb9bef01c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100245 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
-rw-r--r--sw/source/core/layout/tabfrm.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 961c1c94171e..a81b7f1c198c 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2494,6 +2494,14 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
}
const bool bSplitError = !Split( nDeadLine, bTryToSplit, ( bTableRowKeep && !(bAllowSplitOfRow || bEmulateTableKeepSplitAllowed) ) );
+
+ // tdf#130639 don't start table on a new page after the fallback "switch off repeating header"
+ if (bSplitError && nRepeat > GetTable()->GetRowsToRepeat())
+ {
+ setFrameAreaPositionValid(false);
+ break;
+ }
+
if (!bTryToSplit && !bSplitError)
{
--nUnSplitted;