diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-23 07:49:49 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:22:40 +0200 |
| commit | 1c0113e74d872139a3c31b03d0d3d1e9099631dd (patch) | |
| tree | bc67b33c96cca156b4e22252d5336984d0b0fbf7 /writerfilter | |
| parent | c8ea6ec10167c2be36d9b58d48d0606106745267 (diff) | |
tdf#92124 DOCX import: don't add a dummy Suffix for an empty LabelFollowedBy
(cherry picked from commit 3e27df1035677c7cca5200858d5d8e8283bf7aa9)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/NumberingManager.cxx
Change-Id: I0c4366ad0a2f81a198860869f670767343a392be
Reviewed-on: https://gerrit.libreoffice.org/19032
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c33af041298fc4897ee1215efda488654955ebf7)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index b19b8618b2f7..e9b8a46c14c4 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -632,7 +632,18 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, if (aMap.find("NumberingType") != aMap.end()) { sal_Int16 nNumberFormat = aMap["NumberingType"].get<sal_Int16>(); - if (nNumberFormat == style::NumberingType::NUMBER_NONE) + + // No need for a zero width space without a real LabelFollowedBy. + bool bLabelFollowedBy = true; + auto it = std::find_if(aLvlProps.begin(), aLvlProps.end(), [](const beans::PropertyValue& rValue) { return rValue.Name == "LabelFollowedBy"; }); + if (it != aLvlProps.end()) + { + sal_Int16 nValue; + if (it->Value >>= nValue) + bLabelFollowedBy = nValue != SvxNumberFormat::NOTHING; + } + + if (bLabelFollowedBy && nNumberFormat == style::NumberingType::NUMBER_NONE) rSuffix = OUString(static_cast<sal_Unicode>(0x200B)); } } |