[gnumeric] xlsx: more schema fixes

[Morten Welinder <mortenw src gnome org>]

commit 03e81b0de4d64a69c0108a84ffc3014b82e02631
Author: Morten Welinder <terra gnome org>
Date:   Mon Mar 23 19:48:08 2015 -0400

    xlsx: more schema fixes

 plugins/excel/ChangeLog            |    1 +
 plugins/excel/xlsx-write-drawing.c |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index a5921cf..aef013d 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -2,6 +2,7 @@
 
        * xlsx-write-drawing.c (xlsx_write_chart_text): Move overlay
        attribute here.
+       (xlsx_write_go_style_full): Fix noFill/solidFill writing.
 
 2015-03-16  Morten Welinder  <terra gnome org>
 
diff --git a/plugins/excel/xlsx-write-drawing.c b/plugins/excel/xlsx-write-drawing.c
index f161115..5b598a1 100644
--- a/plugins/excel/xlsx-write-drawing.c
+++ b/plugins/excel/xlsx-write-drawing.c
@@ -468,7 +468,6 @@ xlsx_write_go_style_full (GsfXMLOut *xml, GOStyle *style, const XLSXStyleContext
                if (is_none) {
                        /* Special meaning of zero width  */
                        gsf_xml_out_add_int (xml, "w", 0);
-                       gsf_xml_out_simple_element (xml, "a:noFill", NULL);
                } else if (!style->line.auto_width && style->line.width > 0)
                        gsf_xml_out_add_int (xml, "w", style->line.width * 12700);
 
@@ -476,13 +475,12 @@ xlsx_write_go_style_full (GsfXMLOut *xml, GOStyle *style, const XLSXStyleContext
                        gsf_xml_out_start_element (xml, "a:solidFill");
                        xlsx_write_rgbarea (xml, style->line.color);
                        gsf_xml_out_end_element (xml);
-               } else if (sctx->must_fill_line) {
+               } else {
                        gsf_xml_out_simple_element
                                (xml,
                                 is_none ? "a:noFill" : "a:solidFill",
                                 NULL);
-               } else if (style->line.auto_dash && !sctx->def_has_lines)
-                       gsf_xml_out_simple_element (xml, "a:noFill", NULL);
+               }
 
                if (!style->line.auto_dash &&
                    style->line.dash_type < G_N_ELEMENTS (dashes) &&