Kaydet (Commit) 8885ffd9 authored tarafından Michael Stahl's avatar Michael Stahl

Revert "sw-table-join-fix-i99267.diff:"

This reverts commit 6b120432.

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
4439427a.

This was then apparently extracted as a patch and added to ooo-build:

https://cgit.freedesktop.org/libreoffice/build/commit/?id=d33db589f6e7814df84f71506539f6f89448d9fd

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:

https://cgit.freedesktop.org/libreoffice/build/commit/?id=d91410b81a02ce9b970ebd838fda0b28f6d8a5f8

Change-Id: I89db4ea0d1b06450c8fd8618cc824612e225fffe
Reviewed-on: https://gerrit.libreoffice.org/52945Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 514c81ad
......@@ -1974,10 +1974,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
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;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment