[Libreoffice-commits] core.git: sw/source

[Mike Kaganski (via logerrit)]

 sw/source/filter/html/htmlnumwriter.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 343f1910d40f6d89658cf6e30b9b8f4af51deb43
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed May 17 11:48:08 2023 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed May 17 20:53:38 2023 +0200

    Simplify a bit
    
    Change-Id: I3d10e85a6141aae6c7741aebb1c0b1ac68ac4364
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151785
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index d3841e43eb38..1be982e77ed7 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -248,11 +248,6 @@ SwHTMLWriter& OutHTML_NumberBulletListStart( SwHTMLWriter& 
rWrt,
         {
             // Unordered list: <UL>
             sOut += OOO_STRING_SVTOOLS_HTML_unorderlist;
-            rWrt.Strm().WriteOString( sOut );
-            OutHTML_BulletImage( rWrt,
-                                    nullptr,
-                                    rNumFormat.GetBrush(),
-                                    rWrt.m_aBulletGrfs[i]);
         }
         else
         {
@@ -302,8 +297,10 @@ SwHTMLWriter& OutHTML_NumberBulletListStart( SwHTMLWriter& 
rWrt,
             }
         }
 
-        if (!sOut.isEmpty() && SVX_NUM_BITMAP != eType)  // second condition 
to avoid adding extra ul, already done before.
-            rWrt.Strm().WriteOString( sOut );
+        rWrt.Strm().WriteOString(sOut);
+
+        if (eType == SVX_NUM_BITMAP)
+            OutHTML_BulletImage(rWrt, nullptr, rNumFormat.GetBrush(), 
rWrt.m_aBulletGrfs[i]);
 
         if( rWrt.m_bCfgOutStyles )
             OutCSS1_NumberBulletListStyleOpt( rWrt, *rInfo.GetNumRule(), 
static_cast<sal_uInt8>(i) );