From 82f7252b143ed18ac517b4261726d094f136047d Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 22 Nov 2019 09:26:14 +0100 Subject: tdf#128499 DOC export: fix lost ToC formatting regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- sw/source/filter/ww8/wrtw8sty.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index aad292dc5b18..e0b08a639602 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -628,7 +628,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; -- cgit v1.2.3