summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2022-04-21 10:04:50 +0300
committerThorsten Behrens <thorsten.behrens@allotropia.de>2022-04-27 00:56:10 +0200
commit3a05acb8f0d94728ea6cbfd7a69dac6ffa7ffc68 (patch)
tree4414ccaaaf4dbbb87c7dd475e3743dd8b40a530a /writerfilter
parent51809407d060973aa00c733615c35cf4222f7e51 (diff)
tdf#148515: RTF filter: do not use char prop defaults for tables
During deduplication of table row (when nStyleType == 0) we should not deduplicate character properties against default style: this leads to invalid default settings for table rows/cells. Attempts to do so are already made during \pard processing when default style is checked if it is paragraph style. But this is not enough: style definition can contain paragraph and character properties as well. Change-Id: If520c5a248897728b7de08a017136ca1a01a5f13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132943 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfsprm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 04df49bc0287..2edfec829edf 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -159,7 +159,7 @@ void RTFSprms::eraseLast(Id nKeyword)
static RTFValue::Pointer_t getDefaultSPRM(Id const id, Id nStyleType)
{
- if (!nStyleType || nStyleType == NS_ooxml::LN_Value_ST_StyleType_character)
+ if (nStyleType == NS_ooxml::LN_Value_ST_StyleType_character)
{
switch (id)
{