summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-07-11 17:34:30 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-18 09:00:50 +0200
commit138269391a9ac8cdc0c00b55e1fbc84a94c84a77 (patch)
tree13c913d1d981748ba546825cca9ffc520cf28265 /writerfilter
parent8fc843472e764ce78c41d59134d72170a27facf9 (diff)
tdf#108955 RTF import: fix missing paragraph background
See commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305: writerfilter RTF import: override style properties like Word, 2014-06-17) for the context. Here the problem was that details of the paragraph background were removed during the style deduplication, but not the paragraph background sprm itself. That was interpreted (correctly) by dmapper as "no background", rather than "inherit from style". Change-Id: I88904cbd0a3c7686ede1f98d06df8fc875978afc Reviewed-on: https://gerrit.libreoffice.org/40099 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfsprm.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index edc978e6bd6f..c88bd910cb88 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -185,6 +185,9 @@ static bool isSPRMChildrenExpected(Id nId)
case NS_ooxml::LN_CT_PBdr_bottom:
case NS_ooxml::LN_CT_PBdr_right:
// Expected children are NS_ooxml::LN_CT_Border_*.
+ SAL_FALLTHROUGH;
+ case NS_ooxml::LN_CT_PrBase_shd:
+ // Expected children are NS_ooxml::LN_CT_Shd_*.
return true;
default: