summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2020-08-18 17:59:26 +0200
committerAndras Timar <andras.timar@collabora.com>2020-08-31 07:18:48 +0200
commit9cb9bc37d1fcd7b61d218ad63893db92a19a0cb6 (patch)
treea115c1c4b7299d9a7e3f13d3866a13aa6e605ea7 /writerfilter
parent8c4831de0d9a2a7d01fc782798862af41bc6d582 (diff)
tdf#131801: sw: support of style references in ListAutoFormat
ListAutoFormat property did support char attributes, but not style references ("CharStyleName"). It is important for correct formatting of pilcrow symbol or list format in some DOCX scenarios. Export to DOCX already works, but not to RTF/DOC. Change-Id: I1bf23d1e45fcc213adcf9aa6f404be803919fbee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100893 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit c77b9c349f0a48392d8cb7a49532844b2cafb5ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101560 Tested-by: Jenkins
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2afbaeef52bd..f0a866ce7cb2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1545,9 +1545,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
{
// this condition isn't ideal but as it happens all
// RES_CHRATR_* have names that start with "Char"
- if (it->Name.startsWith("Char")
-// TODO testParagraphMark *wants* this but it's some effort to create a real SwFormatCharFormat...
- && !it->Name.startsWith("CharStyleName"))
+ if (it->Name.startsWith("Char"))
{
charProperties.emplace_back(it->Name, it->Value);
// as testN793262 demonstrates, font size in rPr must