summaryrefslogtreecommitdiff
path: root/nlpsolver
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-04-16 10:34:09 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-04-16 14:38:28 +0200
commit8885ffd9702f72047d9fc94c82ee57221e4e927c (patch)
treebc9247c457814a241bddebb46950884624f45062 /nlpsolver
parent514c81ad1693ed9d356a73b978344490059dda4c (diff)
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 4439427aadeaa0cb611011b46f0fa14bfa196f33. 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/52945 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'nlpsolver')
0 files changed, 0 insertions, 0 deletions