diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-08-22 14:22:48 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2018-08-24 06:29:47 +0200 |
| commit | 2902771581ccd6465b3e8cdca0aa3fcb6d51ca60 (patch) | |
| tree | 836fc0149794dbac40798096c6645d8618c16414 /sw | |
| parent | 84c1b71f2bc525597e0877a2abd235a69dbc00d6 (diff) | |
tdf#91292 docx export: COL_AUTO != cleared fill
required for tdf#90906.
If the color was COL_AUTO, then the fill was already
marked as NONE, so that doesn't indicate a "change"
made by the user since the document opened, and thus
the original information shouldn't be tossed.
Change-Id: I2e20c228c2a5f61826320798a2f07d94f0da024c
Reviewed-on: https://gerrit.libreoffice.org/59442
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 845763404813..4c6aba493ce7 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8348,7 +8348,7 @@ void DocxAttributeOutput::FormatFillStyle( const XFillStyleItem& rFillStyle ) m_bIgnoreNextFill = false; // Don't round-trip grabbag OriginalBackground if the background has been cleared. - if ( m_pBackgroundAttrList.is() && rFillStyle.GetValue() == drawing::FillStyle_NONE ) + if ( m_pBackgroundAttrList.is() && m_sOriginalBackgroundColor != "auto" && rFillStyle.GetValue() == drawing::FillStyle_NONE ) m_pBackgroundAttrList.clear(); } |