summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2015-11-27 06:46:18 +0300
committerJustin Luth <justin_luth@sil.org>2015-12-03 19:11:46 +0000
commit04164c70f23ff49c308f62f36e45a589afa168d0 (patch)
tree3a9f826c2289e71f734b85faa2722d9e6f5a403d /sw/source/core
parenta5533e8a2098669490f007efa4f3753e4a25862c (diff)
tdf#34957 - don't push multi-page table to next page.
Removing an old hack that is no longer needed. A table marked as “keep with next” doesn't split and keeps with the following paragraph already. It doesn't require this old hack to function properly anymore. Preventing tables from splitting had forced large tables to always start on a new page. Removing the hack allows everything to lay out nicely now. There is a fairly large suite of tests in the bug report that prove the proper layout of various keep-with-next situations. Any document depending on the old behaviour can simply (and properly) insert a manual page-break before the table in order to force it to start on a new page. Change-Id: Ie2036c1a638009aaf95247574998077a1e55b5e5 Reviewed-on: https://gerrit.libreoffice.org/20216 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/layout/tabfrm.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index cea182f6360c..236ac881d9d7 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1768,9 +1768,8 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
const bool bKeep = IsKeep( pAttrs->GetAttrSet() );
// All rows should keep together
- // OD 2004-05-25 #i21478# - don't split table, if it has to keep with next
const bool bDontSplit = !IsFollow() &&
- ( !GetFormat()->GetLayoutSplit().GetValue() || bKeep );
+ ( !GetFormat()->GetLayoutSplit().GetValue() );
// The number of repeated headlines
const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat();