diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-06-25 11:42:02 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-07-08 10:39:15 +0200 |
| commit | 54b6a6a5c95ed51ce0cd709d9fd3e477ced5ce8f (patch) | |
| tree | 9b20ac1617deffce9fda62c374343db62cea8ec8 | |
| parent | faa9ed4c2bc043cb2c483db799c2a696b66a5435 (diff) | |
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.Behrens@CIB.de>
(cherry picked from commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98331
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf83309.docx | bin | 12795 -> 12811 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx b/sw/qa/extras/ooxmlexport/data/tdf83309.docx Binary files differindex 8dfddb6ed201..e8f59bc81969 100644 --- a/sw/qa/extras/ooxmlexport/data/tdf83309.docx +++ b/sw/qa/extras/ooxmlexport/data/tdf83309.docx diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index c96dbba8dcb8..11b851c7ee8c 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -231,6 +231,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: |