summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2019-11-22 09:26:14 +0100
committerLászló Németh <nemeth@numbertext.org>2019-11-22 14:59:19 +0100
commit82f7252b143ed18ac517b4261726d094f136047d (patch)
treeac5159441522954959729f65f644042585526482
parent122468bf97f1ea456274991103a13489b8d5df58 (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>
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx3
1 files changed, 2 insertions, 1 deletions
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;