[Libreoffice-commits] core.git: sw/source
László Németh (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 22 14:00:04 UTC 2019
sw/source/filter/ww8/wrtw8sty.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 82f7252b143ed18ac517b4261726d094f136047d
Author: László Németh <nemeth at numbertext.org>
AuthorDate: Fri Nov 22 09:26:14 2019 +0100
Commit: László Németh <nemeth at numbertext.org>
CommitDate: Fri Nov 22 14:59:19 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>
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;
More information about the Libreoffice-commits
mailing list