| commit | 9449d50a885b91bcf4f75b6569d5f3b28e868076 | |
| author | Mike Kaganski <mike.kaganski@collabora.com> | |
| Tue, 30 May 2023 09:11:08 +0000 (30 12:11 +0300) | ||
| committer | Andras Timar <andras.timar@collabora.com> | |
| Wed, 31 May 2023 05:24:26 +0000 (31 07:24 +0200) | ||
| tree | 4a79a9f600bbbbe79ce9d583a1b33d217f27ea5c | treesnapshot (tar.gz zip) |
| parent | f425c0aab6e33b8029bf7e87ac9b10b4b4489ac9 | commitdiff |
Fix CI breakage from commit 36831c668c53fdfcd78300045e6beafccbba35c6
It backported commit ebf8b0b0699fe34c86badb3087869d902a4e40a8 from
libreoffice-7-5 to co-23.05; and in the process, it manually restored
the 'if (rWrt.mbXHTML)' condition, that was removed in co-23.05 in
commit b401ff5020264adef2fd68c111d9bc9ea84ee1ab (htmlexport: close li
mark not only in xhtml, 2023-02-08).
Unfortunately, the backport that included manual merge conflict
resolution wasn't CI-tested.
Change-Id: Id42b6309ed92e209b682b4b1cf5578e2a0f20fc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152385
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
It backported commit ebf8b0b0699fe34c86badb3087869d902a4e40a8 from
libreoffice-7-5 to co-23.05; and in the process, it manually restored
the 'if (rWrt.mbXHTML)' condition, that was removed in co-23.05 in
commit b401ff5020264adef2fd68c111d9bc9ea84ee1ab (htmlexport: close li
mark not only in xhtml, 2023-02-08).
Unfortunately, the backport that included manual merge conflict
resolution wasn't CI-tested.
Change-Id: Id42b6309ed92e209b682b4b1cf5578e2a0f20fc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152385
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| sw/source/filter/html/htmlnumwriter.cxx | diffblobblamehistory |