sw/source/core/layout/tabfrm.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 8885ffd9702f72047d9fc94c82ee57221e4e927c
Author: Michael Stahl <michael.st...@cib.de>
Date:   Mon Apr 16 10:34:09 2018 +0200

    Revert "sw-table-join-fix-i99267.diff:"
    This reverts commit 6b1204329ad365a46214472bcff335e63c51bdf4.
    The comment has nothing to do with the code around it,
    and it turns out the commit is utter nonsense:
    The actual intended change was done in CWS sw32bf02 at a different
    place in SwTabFrame::MakeAll(), see commit
    This was then apparently extracted as a patch and added to ooo-build:
    And then there was a rebase on top of a DEV300 that includes
    the CWS and that moved the patch to apply in this incorrect location:
    Change-Id: I89db4ea0d1b06450c8fd8618cc824612e225fffe
    Reviewed-on: https://gerrit.libreoffice.org/52945
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 67ee9cc37a18..31c5ae3f6250 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1974,10 +1974,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext* 
                 pPre->GetAttrSet()->GetKeep().GetValue()) )
                 m_bCalcLowers = true;
-                // #i99267#
-                // reset <bSplit> after forward move to assure that follows
-                // can be joined, if further space is available.
-                bSplit = false;
Libreoffice-commits mailing list

Reply via email to