sw/qa/extras/ooxmlexport/data/tdf83309.docx |binary
writerfilter/source/dmapper/NumberingManager.cxx | 2 ++
2 files changed, 2 insertions(+)
New commits:
commit 989cdd0a5b2efa83ff0b4ca8bc2adb0b64bde1bb
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Thu Jun 25 11:42:02 2020 +0300
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jul 9 16:48:20 2020 +0200
tdf#134260: docx import: allow default value for list tab position
It looks like previously used as a testcase document is just
a specific case with default values. All other readers (incl.
Office 365) displaying that doc with default tab at zero position.
Change-Id: I50fe00c7f87b6d790fbe6e2f32a306ac59060c72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97089
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98331
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 54b6a6a5c95ed51ce0cd709d9fd3e477ced5ce8f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98332
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx
b/sw/qa/extras/ooxmlexport/data/tdf83309.docx
index 8dfddb6ed201..e8f59bc81969 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf83309.docx and
b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index b197e4db80c2..3ea0e2e59da1 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -221,6 +221,8 @@ uno::Sequence<beans::PropertyValue>
ListLevel::GetLevelProperties(bool bDefaults
if (m_nTabstop.has_value())
aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION,
*m_nTabstop));
+ else if (bDefaults)
+
aNumberingProperties.push_back(lcl_makePropVal<sal_Int16>(PROP_LISTTAB_STOP_POSITION,
0));
//TODO: handling of nFLegal?
//TODO: nFNoRestart lower levels do not restart when higher levels are
incremented, like:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
