sw/source/filter/ww8/wrtw8sty.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e18866b6bcca32b07864456d6960b2ae09ac89c6
Author: László Németh <nem...@numbertext.org>
AuthorDate: Fri Nov 22 09:26:14 2019 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sat Nov 23 17:37:37 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 <nem...@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í <xiscofa...@libreoffice.org>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
