diff options
author | László Németh <nemeth@numbertext.org> | 2019-11-22 09:26:14 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-11-22 17:41:26 +0100 |
commit | a92794b86ed9c8673b4907a2369f30180e78e14e (patch) | |
tree | 3ad8c5983d99663ebecaab7945edd60fa9524efc /sw/source/filter/ww8/wrtw8sty.cxx | |
parent | ef39938dea14666a5835b6ae85091c1010f8ae8d (diff) |
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@numbertext.org>
(cherry picked from commit 82f7252b143ed18ac517b4261726d094f136047d)
Reviewed-on: https://gerrit.libreoffice.org/83491
Diffstat (limited to 'sw/source/filter/ww8/wrtw8sty.cxx')
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3c6813406420..d04cfeb8e6f8 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -624,7 +624,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; |