sw/source/filter/ww8/docxattributeoutput.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2902771581ccd6465b3e8cdca0aa3fcb6d51ca60
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Wed Aug 22 14:22:48 2018 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Fri Aug 24 06:29:47 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_l...@sil.org>
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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
