From 4235206c340f0a8e8cc38b18403a7f0fbee04f7a Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 22 Aug 2018 14:22:48 +0300 Subject: 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 (cherry picked from commit 2902771581ccd6465b3e8cdca0aa3fcb6d51ca60) Reviewed-on: https://gerrit.libreoffice.org/59535 Reviewed-by: Miklos Vajna --- sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8529a06ad0bf..bd0fc3272407 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8358,7 +8358,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(); } -- cgit v1.2.3