[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4235206c340f0a8e8cc38b18403a7f0fbee04f7a
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Wed Aug 22 14:22:48 2018 +0300
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Fri Aug 31 09:53:34 2018 +0200

    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 at sil.org>
    (cherry picked from commit 2902771581ccd6465b3e8cdca0aa3fcb6d51ca60)
    Reviewed-on: https://gerrit.libreoffice.org/59535
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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();
 }