diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-08-27 13:13:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-08-27 14:00:12 +0200 |
| commit | 9ea594ffcf4f807306440e4628eecca8c75be8ee (patch) | |
| tree | 5d219b28e546eb9be3b8c063b11a678b186e8c51 /writerfilter | |
| parent | c56178f0daf69abb362e6216f51b6e1f5aff1777 (diff) | |
tdf#137363 DOCX filter: don't loose <w:ilvl w:val="..."> of paragraph styles
This adds doc model, UNO API and DOCX import/export for this feature.
The rest is not yet implemented (i.e. no layout, UI, etc.)
An alternative would be to grab-bag the list level of paragraph styles,
putting it to the doc model directly has the benefit that this is a step
in the right direction.
Change-Id: Idf7157e8a4177b4c2286d3cfb3d5acf2df845076
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121141
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index f5731e735cbe..9503306b05ec 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1329,8 +1329,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (pStyleSheetPropertyMap) pStyleSheetPropertyMap->SetListLevel( static_cast<sal_Int16>(nIntValue) ); } - else - rContext->Insert( PROP_NUMBERING_LEVEL, uno::makeAny( static_cast<sal_Int16>(nIntValue) )); + rContext->Insert(PROP_NUMBERING_LEVEL, uno::makeAny(static_cast<sal_Int16>(nIntValue))); break; case NS_ooxml::LN_CT_NumPr_numId: { @@ -1564,6 +1563,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() ); if (pStyleSheetPropertyMap) pStyleSheetPropertyMap->SetOutlineLevel(nIntValue); + + // Prefer outline levels over numbering levels. + rContext->Erase(PROP_NUMBERING_LEVEL); } else { |