summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxattributeoutput.cxx
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-10-28 21:50:04 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-01-11 11:00:56 +0100
commit29d57a3f0c60afc1bd3a79a01e18e99bf4e8edcb (patch)
tree38fb10a3a5c18a5a8f600403051af7270c25e858 /sw/source/filter/ww8/docxattributeoutput.cxx
parentaa957dffaa40a7d4f34ec90ea50779532bdc9540 (diff)
tdf#91292 ooxmlexport: cleared fill != use grabbag info
A while back the way that backgrounds are handled changed. This was one spot where the changes didn't sync up. When the background is cleared, then the imported grabbag attributes should be tossed, not re-applied during save. Change-Id: I9759def6321697a634bcbd66ecdc9d73693ce1a3 Reviewed-on: https://gerrit.libreoffice.org/44040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index fbcc5e634f2d..2a1dc9c68bdb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8325,6 +8325,10 @@ void DocxAttributeOutput::FormatFillStyle( const XFillStyleItem& rFillStyle )
m_oFillStyle.reset(rFillStyle.GetValue());
else
m_bIgnoreNextFill = false;
+
+ // Don't round-trip grabbag OriginalBackground if the background has been cleared.
+ if ( m_pBackgroundAttrList.is() && rFillStyle.GetValue() == drawing::FillStyle_NONE )
+ m_pBackgroundAttrList.clear();
}
void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGradient )