[gnumeric] xlsx: read a bit more of the drawing grammar.

[Morten Welinder <mortenw src gnome org>]

commit ac8d4b337eddc230f6b4ef9c9e4957ec1b9506e1
Author: Morten Welinder <terra gnome org>
Date:   Thu Mar 16 13:17:04 2017 -0400

    xlsx: read a bit more of the drawing grammar.
    
    Mostly just quiets warnings.

 plugins/excel/ChangeLog           |    5 +++++
 plugins/excel/xlsx-read-drawing.c |    7 +++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 80c6fd1..f8872d0 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-16  Morten Welinder  <terra gnome org>
+
+       * xlsx-read-drawing.c (xlsx_drawing_dtd): Fill out the grammar a
+       bit more to quiet some warnings.
+
 2017-03-08  Morten Welinder  <terra gnome org>
 
        * xlsx-write.c (by_hlink_order): Simplify order.
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 955e0b1..789b738 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -3460,11 +3460,13 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
          GSF_XML_IN_NODE (TEXT_PR, TEXT_PR_P,  XL_NS_DRAW, "p", GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (TEXT_PR_P, TX_RICH_R, XL_NS_DRAW, "r", GSF_XML_NO_CONTENT, NULL, NULL),
              GSF_XML_IN_NODE (TX_RICH_R, TX_RICH_R_PR, XL_NS_DRAW, "rPr", GSF_XML_NO_CONTENT, NULL, NULL),
+                GSF_XML_IN_NODE (TX_RICH_R_PR, EFFECT_LST, XL_NS_DRAW, "effectLst", GSF_XML_NO_CONTENT, 
NULL, NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, PR_P_PR_DEF_CS, XL_NS_DRAW, "cs", GSF_XML_NO_CONTENT, NULL, 
NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, PR_P_PR_DEF_EA, XL_NS_DRAW, "ea", GSF_XML_NO_CONTENT, NULL, 
NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, PR_P_PR_DEF_LATIN, XL_NS_DRAW, "latin", GSF_XML_NO_CONTENT, 
&xlsx_rpr_latin, NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, TEXT_FILL_SOLID, XL_NS_DRAW, "solidFill", GSF_XML_NO_CONTENT, 
NULL, NULL),
                  GSF_XML_IN_NODE (TEXT_FILL_SOLID, COLOR_RGB, XL_NS_DRAW, "srgbClr", GSF_XML_2ND, NULL, 
NULL),
+                 GSF_XML_IN_NODE (TEXT_FILL_SOLID, COLOR_THEMED, XL_NS_DRAW, "schemeClr", GSF_XML_2ND, NULL, 
NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, PR_P_PR_DEF_UFILLTX, XL_NS_DRAW, "uFillTx", 
GSF_XML_NO_CONTENT, NULL, NULL),
                GSF_XML_IN_NODE (TX_RICH_R_PR, PR_P_PR_DEF_ULNTX, XL_NS_DRAW, "uLnTx", GSF_XML_NO_CONTENT, 
NULL, NULL),
 
@@ -3478,6 +3480,11 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
                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 (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, FILL_SOLID, XL_NS_DRAW, "solidFill", GSF_XML_2ND, NULL, NULL),
+              GSF_XML_IN_NODE (PR_P_PR_END, EFFECT_LST, XL_NS_DRAW, "effectLst", GSF_XML_2ND, NULL, NULL),
+             GSF_XML_IN_NODE (PR_P_PR_END, PR_P_PR_DEF_CS, XL_NS_DRAW, "cs", GSF_XML_2ND, NULL, NULL),
+             GSF_XML_IN_NODE (PR_P_PR_END, PR_P_PR_DEF_EA, XL_NS_DRAW, "ea", 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 (SHAPE_PR, CXN_SP, XL_NS_SS_DRAW, "cxnSp", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (CXN_SP, CXN_SP_PR, XL_NS_SS_DRAW, "nvCxnSpPr", GSF_XML_NO_CONTENT, NULL, NULL),