diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-14 19:13:34 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-15 17:33:06 +0100 |
commit | ff9be3fd30ead41359734f9281b034a988d71196 (patch) | |
tree | 6c505ff237cc7ed93d637f214df594fdaadafd8a /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
parent | 179991383e26e093b307deb9983c67e8e0833d72 (diff) |
tdf#158597 writerfilter,sw: fix toggle properties in ListAutoFormat
... for DOCX import.
These can be set both via paragraph style and via character style in the
w:pPr/w:rPr, so use the applyToggleAttributes().
Adding a test for this requires adding the "CharStyleName" property to
GetAutoCharStylePropertyMap().
Change-Id: I9701d5ac82ec3e7757650c08861791dc398a1a77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163386
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 9f56d17c2ec6..70b8f6d74554 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2533,6 +2533,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con lcl_AddRange(pToBeSavedProperties, xTextAppend, rAppendContext); } } + applyToggleAttributes(pPropertyMap); // for paragraph marker formatting std::vector<beans::PropertyValue> aProperties; if (pPropertyMap) { @@ -3011,6 +3012,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con } +// TODO this does not yet take table styles into account void DomainMapper_Impl::applyToggleAttributes(const PropertyMapPtr& pPropertyMap) { std::optional<PropertyMap::Property> charStyleProperty = pPropertyMap->getProperty(PROP_CHAR_STYLE_NAME); |