Commit 04be9501 authored by Jean Bréfort's avatar Jean Bréfort

Always export a transparent fill style in charts. [#779160]

parent 7ae7f207
...@@ -2,6 +2,7 @@ Gnumeric 1.12.34 ...@@ -2,6 +2,7 @@ Gnumeric 1.12.34
Jean: Jean:
* Fix xlsx export of chart series names. [#778618] * Fix xlsx export of chart series names. [#778618]
* Always export a transparent fill style in charts. [#779160]
Morten: Morten:
* Doc fixes. * Doc fixes.
......
2017-02-26 Jean Brefort <jean.brefort@normalesup.org>
* xlsx-write-drawing.c (xlsx_write_go_style_full): always export a
transparent fill style. [#779160]
(xlsx_write_one_chart): simplify legend style export.
2017-02-21 Jean Brefort <jean.brefort@normalesup.org> 2017-02-21 Jean Brefort <jean.brefort@normalesup.org>
* xlsx-write-drawing.c (xlsx_write_one_chart): export legend style. * xlsx-write-drawing.c (xlsx_write_one_chart): export legend style.
......
...@@ -353,9 +353,7 @@ xlsx_write_go_style_full (GsfXMLOut *xml, GOStyle *style, const XLSXStyleContext ...@@ -353,9 +353,7 @@ xlsx_write_go_style_full (GsfXMLOut *xml, GOStyle *style, const XLSXStyleContext
gsf_xml_out_end_element (xml); /* </a:prstGeom> */ gsf_xml_out_end_element (xml); /* </a:prstGeom> */
} }
if ((style->interesting_fields & GO_STYLE_FILL) && if (style->interesting_fields & GO_STYLE_FILL) {
(style->fill.type != GO_STYLE_FILL_NONE ||
sctx->must_fill_fill)) {
switch (style->fill.type) { switch (style->fill.type) {
default: default:
g_warning ("invalid fill type, saving as none"); g_warning ("invalid fill type, saving as none");
...@@ -1310,15 +1308,7 @@ xlsx_write_one_chart (XLSXWriteState *state, GsfXMLOut *xml, GogObject const *ch ...@@ -1310,15 +1308,7 @@ xlsx_write_one_chart (XLSXWriteState *state, GsfXMLOut *xml, GogObject const *ch
} }
xlsx_write_chart_cstr_unchecked (xml, "c:legendPos", str); xlsx_write_chart_cstr_unchecked (xml, "c:legendPos", str);
xlsx_write_layout (xml, obj); xlsx_write_layout (xml, obj);
{ xlsx_write_go_style (xml, state, go_styled_object_get_style (GO_STYLED_OBJECT (obj)));
/* we need to ensure that fill mode is exported even if set to none. */
XLSXStyleContext sctx;
xlsx_style_context_init (&sctx, state);
sctx.must_fill_fill = TRUE;
xlsx_write_go_style_full
(xml, go_styled_object_get_style (GO_STYLED_OBJECT (obj)),
&sctx);
}
gsf_xml_out_end_element (xml); /* </c:legend> */ gsf_xml_out_end_element (xml); /* </c:legend> */
} }
gsf_xml_out_end_element (xml); /* </c:chart> */ gsf_xml_out_end_element (xml); /* </c:chart> */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment