diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-05-29 14:25:04 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-06 02:19:42 +0200 |
| commit | a380a06c1872091e8fa8c810e95a8e1d5dfe1820 (patch) | |
| tree | 5ab84ca14e453d44b5823c97457d3acc90266e4c /writerfilter | |
| parent | f0caaa6005009f64c0968fd8482e2515810eefcc (diff) | |
tdf#83309: docx import: allow for lists tabstop at zero position
Zero position is valid value for tabstop, but previously it was
treated as "no tab stop defined". Right now writer distinguishes
tab stop at zero postion and no tab stop.
Change-Id: Ie32da3d36a263644ba85a882029a8b29ae0501c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95132
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit d2e428d1abb9f2907c0b87d55830e8742f8209b9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95561
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.hxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 3ecc38fc383c..916583eec02f 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -229,8 +229,8 @@ uno::Sequence<beans::PropertyValue> ListLevel::GetLevelProperties(bool bDefaults aNumberingProperties.push_back(lcl_makePropVal(PROP_GRAPHIC_SIZE, m_aGraphicSize)); } - if (bDefaults || m_nTabstop != 0) - aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, m_nTabstop)); + if (m_nTabstop.has_value()) + aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, *m_nTabstop)); //TODO: handling of nFLegal? //TODO: nFNoRestart lower levels do not restart when higher levels are incremented, like: diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index f2f89eca9f40..070086daa52b 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -51,7 +51,7 @@ class ListLevel : public PropertyMap OUString m_sBulletChar; css::awt::Size m_aGraphicSize; css::uno::Reference<css::awt::XBitmap> m_xGraphicBitmap; - sal_Int32 m_nTabstop; + std::optional<sal_Int32> m_nTabstop; tools::SvRef< StyleSheetEntry > m_pParaStyle; bool m_outline; bool m_bHasValues = false; @@ -65,7 +65,6 @@ public: ,m_nStartOverride(-1) ,m_nNFC(-1) ,m_nXChFollow(SvxNumberFormat::LISTTAB) - ,m_nTabstop( 0 ) ,m_outline(false) {} |