diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-02 09:01:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-02 09:44:28 +0100 |
| commit | fbe7612d654be9dfe1ea6f2e67900eb4eec4202a (patch) | |
| tree | d90795b46f9a456c76fd5f297aaff5f4750cd3a6 /writerfilter/source | |
| parent | a526e85a0d6371781482a9b7de4e05b8b2578de2 (diff) | |
tdf#129205 DOCX import: handle the <w:shd w:val="nil" ...> paragraph property
Reading the spec, "nil" is the opposite of "clear": i.e. if the
(background) color is red and the fill (color) is green, then "clear"
means green. And you would expect "nil" means red, but it's just nothing
in Word.
Fix the problem by doing the same: don't set any paragraph property for
the "nil" case and keep doing it for the common "clear" case.
Change-Id: I30af8a7fb55fb9bab2d12e120069a479fc7ab0a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86096
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index b5889742c29a..a830b5783116 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -276,7 +276,7 @@ TablePropertyMapPtr CellColorHandler::getProperties() pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( nShadingPattern )); } - if (m_OutputFormat == Paragraph) + if (m_OutputFormat == Paragraph && m_nShadingPattern != NS_ooxml::LN_Value_ST_Shd_nil) { if (nWW8BrushStyle || !m_bAutoFillColor) pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_SOLID)); |