[gnumeric] xlsx: complete grammar for "2011-12 Sales.xlsx" sample

[Morten Welinder <mortenw src gnome org>]

commit b0c89908754268d4a1f022cd9e22672ca9cb52a1
Author: Morten Welinder <terra gnome org>
Date:   Mon Mar 30 18:48:25 2015 -0400

    xlsx: complete grammar for "2011-12 Sales.xlsx" sample

 plugins/excel/ChangeLog           |    1 +
 plugins/excel/xlsx-read-drawing.c |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index e2b7178..d419312 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -4,6 +4,7 @@
        xlsx_draw_color_alpha.  Handle all four channels.
        (xlsx_draw_color_hsl_channel): Hook up hue-sat-lum modification.
        (xlsx_draw_color_scrgb): Properly parse <scrgbClr>.
+       (xlsx_chart_drawing_dtd): more grammar.
 
 2015-03-30  Jean Brefort  <jean brefort normalesup org>
 
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 0c32aaf..bb50f32 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -754,7 +754,7 @@ GSF_XML_IN_NODE_FULL (START, USER_SHAPES, XL_NS_CHART, "userShapes", GSF_XML_NO_
                 GSF_XML_IN_NODE (PR_P_PR_DEF, PR_P_PR_DEF_CS, XL_NS_DRAW, "cs", GSF_XML_NO_CONTENT, NULL, 
NULL),
                 GSF_XML_IN_NODE (PR_P_PR_DEF, PR_P_PR_DEF_EA, XL_NS_DRAW, "ea", GSF_XML_NO_CONTENT, NULL, 
NULL),
                 GSF_XML_IN_NODE (PR_P_PR_DEF, PR_P_PR_DEF_LATIN, XL_NS_DRAW, "latin", GSF_XML_NO_CONTENT, 
NULL, NULL),
-                GSF_XML_IN_NODE (PR_P_PR_DEF, FILL_SOLID, XL_NS_DRAW, "solidFill", GSF_XML_NO_CONTENT, NULL, 
NULL),
+                GSF_XML_IN_NODE (PR_P_PR_DEF, TEXT_FILL_SOLID, XL_NS_DRAW, "solidFill", GSF_XML_2ND, NULL, 
NULL),
                 GSF_XML_IN_NODE (PR_P_PR_DEF, PR_P_PR_DEF_UFILLTX, XL_NS_DRAW, "uFillTx", 
GSF_XML_NO_CONTENT, NULL, NULL),
                 GSF_XML_IN_NODE (PR_P_PR_DEF, PR_P_PR_DEF_ULNTX, XL_NS_DRAW, "uLnTx", GSF_XML_NO_CONTENT, 
NULL, NULL),
             GSF_XML_IN_NODE (TX_RICH_FLD, TX_RICH_R_T, XL_NS_DRAW,  "t", GSF_XML_CONTENT, NULL, 
&xlsx_chart_text_content),
@@ -763,6 +763,8 @@ GSF_XML_IN_NODE_FULL (START, USER_SHAPES, XL_NS_CHART, "userShapes", GSF_XML_NO_
             GSF_XML_IN_NODE (TX_RICH_R, TX_RICH_R_T, XL_NS_DRAW,  "t", GSF_XML_NO_CONTENT, NULL, NULL),      
  /* 2nd Def */
          GSF_XML_IN_NODE (TEXT_PR_P, PR_P_PR,  XL_NS_DRAW, "pPr", GSF_XML_NO_CONTENT, NULL, NULL),     /* 
2nd Def */
          GSF_XML_IN_NODE (TEXT_PR_P, PR_P_PR_END,XL_NS_DRAW, "endParaRPr", GSF_XML_NO_CONTENT, NULL, NULL),
+            GSF_XML_IN_NODE (PR_P_PR_END, TEXT_FILL_SOLID, XL_NS_DRAW, "solidFill", GSF_XML_2ND, NULL, NULL),
+            GSF_XML_IN_NODE (PR_P_PR_END, PR_P_PR_DEF_LATIN, XL_NS_DRAW, "latin", GSF_XML_2ND, NULL, NULL),
           GSF_XML_IN_NODE (TEXT_PR_P, TX_RICH_R_T, XL_NS_DRAW,  "t", GSF_XML_NO_CONTENT, NULL, NULL),  /* 
2nd Def */
        GSF_XML_IN_NODE_END
 };