[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/filter/html/htmlnumwriter.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 9449d50a885b91bcf4f75b6569d5f3b28e868076
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue May 30 12:11:08 2023 +0300
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed May 31 07:24:26 2023 +0200

    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.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index a3bc30891f76..2bb4f5d96457 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -287,15 +287,12 @@ Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
     bool bListEnd = !bSameRule || rNextInfo.GetDepth() < rInfo.GetDepth() || 
rNextInfo.IsRestart(rInfo);
     bool bNextIsSubitem = !bListEnd && rNextInfo.GetDepth() > rInfo.GetDepth();
 
-    if (rWrt.mbXHTML)
+    // XHTML </li> for the list item content, if there is an open <li>.
+    if (bListEnd || (!bNextIsSubitem && rNextInfo.IsNumbered()))
     {
-        // XHTML </li> for the list item content, if there is an open <li>.
-        if (bListEnd || (!bNextIsSubitem && rNextInfo.IsNumbered()))
-        {
-            HTMLOutFuncs::Out_AsciiTag(
-                rWrt.Strm(), Concat2View(rWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_li),
-                false);
-        }
+        HTMLOutFuncs::Out_AsciiTag(
+            rWrt.Strm(), Concat2View(rWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_li),
+            false);
     }
 
     if (!bListEnd)