diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2021-10-23 11:48:07 +0200 |
|---|---|---|
| committer | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2021-10-23 21:28:25 +0200 |
| commit | b66ed4cb3707800b8bd9ab0f397c226037e10fbf (patch) | |
| tree | 627d0b6b73078ba2481265cb1692c0abda38e9f5 /writerfilter | |
| parent | 911c74d0ec05a2b216936e3f58900a4aea137146 (diff) | |
tdf#145215: docx: do not initialize prefix/suffix and include levels
On DOCX import we do not need to provide prefix, suffix and included
levels: these values are calculated in SvxNumberFormat out from list
format. Moreover these values are incorrect and do not correspond
not to DOCX data nor to internal writer representation of list level.
Change-Id: I91ec9de679e67056ba3746f2e1a0bd923532d76c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124090
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 852d5e611750..66c26b18cb57 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -576,8 +576,6 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_CHAR_STYLE_NAME), sStyle)); } - // Get the prefix / suffix / Parent numbering - // and add them to the level properties OUString sText = pAbsLevel ? pAbsLevel->GetBulletChar() : OUString(); @@ -585,15 +583,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, if (pLevel && pLevel->HasBulletChar()) sText = pLevel->GetBulletChar( ); - aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_PREFIX), OUString(""))); - aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_SUFFIX), OUString(""))); aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_LIST_FORMAT), sText)); - // Total count of replacement holders is determining amount of required parent numbering to include - // TODO: not sure how "%" symbol is escaped. This is not supported yet - sal_Int16 nParentNum = comphelper::string::getTokenCount(sText, '%'); - aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_PARENT_NUMBERING), nParentNum)); - aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_POSITION_AND_SPACE_MODE), sal_Int16(text::PositionAndSpaceMode::LABEL_ALIGNMENT))); // Replace the numbering rules for the level |