[gnumeric] xlsx: fix colouring issue in graphs.

[Morten Welinder <mortenw src gnome org>]

commit 0ebfc5ab28222645dab054c1a9217f9f6f506117
Author: Morten Welinder <terra gnome org>
Date:   Thu Mar 16 20:38:40 2017 -0400

    xlsx: fix colouring issue in graphs.
    
    Also add a few extra nodes to the grammar.

 plugins/excel/xlsx-read-drawing.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 789b738..3077de1 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2409,6 +2409,8 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
     GSF_XML_IN_NODE (SHAPE_PR, FILL_BLIP,      XL_NS_DRAW, "blipFill", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_BLIP,      XL_NS_DRAW, "blip", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_SRC,       XL_NS_DRAW, "srcRect", GSF_XML_NO_CONTENT, NULL, 
NULL),
+      GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_STRETCH,   XL_NS_DRAW, "stretch", GSF_XML_NO_CONTENT, NULL, 
NULL),
+        GSF_XML_IN_NODE (FILL_BLIP_STRETCH, BLIP_FILL_RECT, XL_NS_DRAW, "fillRect", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_TILE,      XL_NS_DRAW, "tile", GSF_XML_NO_CONTENT, NULL, NULL),
 
     GSF_XML_IN_NODE (SHAPE_PR, FILL_GRAD,      XL_NS_DRAW, "gradFill", GSF_XML_NO_CONTENT, 
&xlsx_draw_grad_fill, NULL),
@@ -2546,6 +2548,12 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (VAL_AXIS, AXIS_DELETE, XL_NS_CHART, "delete", GSF_XML_2ND, NULL, NULL),
          GSF_XML_IN_NODE (VAL_AXIS, AXIS_DISPUNITS, XL_NS_CHART, "dispUnits", GSF_XML_NO_CONTENT, NULL, 
NULL),
          GSF_XML_IN_NODE (AXIS_DISPUNITS, AXIS_CUSTUNIT, XL_NS_CHART, "custUnit", GSF_XML_NO_CONTENT, 
&xlsx_axis_custom_unit, NULL),
+         GSF_XML_IN_NODE (AXIS_DISPUNITS, AXIS_DISPUNITSLBL, XL_NS_CHART, "dispUnitsLbl", 
GSF_XML_NO_CONTENT, NULL, NULL),
+#if 0
+             GSF_XML_IN_NODE (AXIS_DISPUNITSLBL, LAYOUT, XL_NS_CHART, "layout", GSF_XML_2ND, NULL, NULL),
+#endif
+             GSF_XML_IN_NODE (AXIS_DISPUNITSLBL, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+             GSF_XML_IN_NODE (AXIS_DISPUNITSLBL, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_2ND, NULL, NULL),
          GSF_XML_IN_NODE (AXIS_DISPUNITS, AXIS_BUILTINUNIT, XL_NS_CHART, "builtInUnit", GSF_XML_NO_CONTENT, 
&xlsx_axis_builtin_unit, NULL),
        GSF_XML_IN_NODE (VAL_AXIS, AXIS_POS, XL_NS_CHART, "axPos", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (VAL_AXIS, AXIS_MAJORGRID, XL_NS_CHART, "majorGridlines", GSF_XML_2ND, NULL, NULL),
@@ -3435,9 +3443,9 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
        GSF_XML_IN_NODE (SHAPE_PR, SP_FILL_NONE,        XL_NS_DRAW, "noFill", GSF_XML_NO_CONTENT, NULL, NULL),
        GSF_XML_IN_NODE (SHAPE_PR, SP_FILL_SOLID,       XL_NS_DRAW, "solidFill", GSF_XML_NO_CONTENT, NULL, 
NULL),
          GSF_XML_IN_NODE (FILL_SOLID, COLOR_THEMED, XL_NS_DRAW, "schemeClr", GSF_XML_NO_CONTENT, 
&xlsx_draw_color_themed, NULL),
-            COLOR_MODIFIER_NODES(COLOR_THEMED,0),
+            COLOR_MODIFIER_NODES(COLOR_THEMED,FALSE),
          GSF_XML_IN_NODE (FILL_SOLID, COLOR_RGB,        XL_NS_DRAW, "srgbClr", GSF_XML_NO_CONTENT, 
&xlsx_draw_color_rgb, NULL),
-            COLOR_MODIFIER_NODES(COLOR_THEMED,0),
+            COLOR_MODIFIER_NODES(COLOR_RGB,FALSE),
 
        GSF_XML_IN_NODE (SHAPE_PR, FILL_GRAD,   XL_NS_DRAW, "gradFill", GSF_XML_NO_CONTENT, 
xlsx_draw_grad_fill, NULL),
          GSF_XML_IN_NODE (FILL_GRAD, GRAD_LIST,        XL_NS_DRAW, "gsLst", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -3505,6 +3513,7 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
       GSF_XML_IN_NODE (SHAPE, NV_SP_PR, XL_NS_SS_DRAW, "nvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (NV_SP_PR, C_NV_PR, XL_NS_SS_DRAW, "cNvPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (NV_SP_PR, C_NV_SP_PR, XL_NS_SS_DRAW, "cNvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (C_NV_SP_PR, SP_LOCKS, XL_NS_DRAW, "spLocks", GSF_XML_NO_CONTENT, NULL, NULL),
 
        GSF_XML_IN_NODE (SP_PR_XFRM, SP_XFRM_EXT, XL_NS_DRAW, "ext", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (SP_XFRM_EXT, SP_PR_PRST_GEOM, XL_NS_DRAW, "prstGeom", GSF_XML_NO_CONTENT, NULL, 
NULL),