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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8par2.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1ad2d1336a3f82e13e2bdfe979154c3a8c936ed6
Author:     Justin Luth <jl...@mail.com>
AuthorDate: Wed Aug 17 14:01:44 2022 -0400
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Thu Aug 18 15:34:07 2022 +0200

    related tdf#150197 doc import: ANLV - always SetListFormat
    
    Any time there is numbering, we expect to see an
    optional sListFormat set.
    
    This solves a few different cases found by:
    assert(false && "depricated format still exists
    and is unhandled. Inform Vasily or Justin");
    
    Change-Id: I127e100a003c46c7a9dfa681014ffc11ceda24ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138452
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c05447b4b1c8..5e00e059700d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -701,10 +701,9 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum, 
int nLevel, WW8_ANLV con
     {
         sSuffix = rNum.GetSuffix() + sText.subView( rAV.cbTextBefore, 
rAV.cbTextAfter);
     }
-    if (rAV.cbTextBefore || rAV.cbTextAfter)
-    {
-        rNum.SetListFormat(sPrefix, sSuffix, nLevel);
-    }
+
+    rNum.SetListFormat(sPrefix, sSuffix, nLevel);
+
 // The characters before and after multiple digits do not apply because
 // those are handled differently by the writer and the result is in most
 // cases worse than without.
@@ -717,6 +716,7 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD 
const * pAD, sal_uInt8
     bool bOutLine)
 {
     SwNumFormat aNF;
+    aNF.SetListFormat("", "", nSwLevel);
     if (pAD)
     {                                                       // there is an 
Anld-Sprm
         m_bCurrentAND_fNumberAcross = 0 != pAD->fNumberAcross;