[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-4' - sw/source

[László Németh (via logerrit)]

 sw/source/filter/ww8/wrtw8sty.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b160368ec0049babacd92011a1e769f6f27787c3
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Fri Nov 22 09:26:14 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 4 17:34:16 2019 +0100

    tdf#128499 DOC export: fix lost ToC formatting regression
    
    caused by commit 7376a47680b65cbdfd747a736f288e06f51f7f2d
    (tdf#92335 DOCX: fix multiplying of "ListLabel" styles).
    
    Change-Id: I7d6fc2be3ad7556b988cb00936b9b49deae23f19
    Reviewed-on: https://gerrit.libreoffice.org/83443
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 82f7252b143ed18ac517b4261726d094f136047d)
    Reviewed-on: https://gerrit.libreoffice.org/83491
    (cherry picked from commit a92794b86ed9c8673b4907a2369f30180e78e14e)
    Reviewed-on: https://gerrit.libreoffice.org/83543
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit e18866b6bcca32b07864456d6960b2ae09ac89c6)
    Reviewed-on: https://gerrit.libreoffice.org/83572
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 6651baaa15b0..3747b59dc0fd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -618,7 +618,8 @@ void MSWordStyles::OutputStyle( SwFormat* pFormat, sal_uInt16 nPos )
                 aName = aBaseName + OUString::number(++nSuffix);
             }
         }
-        else if (!bFormatColl && m_rExport.m_pStyles->GetStyleId(nPos).startsWith("ListLabel"))
+        else if (!bFormatColl && m_rExport.GetExportFormat() == MSWordExportBase::DOCX &&
+                        m_rExport.m_pStyles->GetStyleId(nPos).startsWith("ListLabel"))
         {
             // tdf#92335 don't export redundant DOCX import style "ListLabel"
             return;