[gnumeric] xlsx: contour plot import improvements

[Morten Welinder <mortenw src gnome org>]

commit 412c528a5cf5f23a460362dbccc621aea1993eac
Author: Morten Welinder <terra gnome org>
Date:   Sat Oct 21 19:28:22 2017 -0400

    xlsx: contour plot import improvements

 plugins/excel/ChangeLog           |    6 ++++++
 plugins/excel/xlsx-read-drawing.c |   11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 88ebb66..24a6ba6 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-21  Morten Welinder  <terra gnome org>
+
+       * xlsx-read-drawing.c (dtd): Add stubs for floor, sidewall, and
+       backwall.
+       (xlsx_chart_contour): Use XLContourPlot object.
+
 2017-10-11  Morten Welinder  <terra gnome org>
 
        * xlsx-read.c (xlsx_wb_name_end): Ignore bogus Print_Area names.
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 1f8af8f..88efda8 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -1298,7 +1298,7 @@ static void
 xlsx_chart_contour (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
 {
        // This is called "surfaceChart" in xlsx.
-       xlsx_chart_add_plot (xin, "GogContourPlot");
+       xlsx_chart_add_plot (xin, "XLContourPlot");
 }
 
 static void
@@ -2469,6 +2469,15 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
 
   GSF_XML_IN_NODE (CHART_SPACE, CHART, XL_NS_CHART, "chart", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (CHART, SHOW_DBLS_OVER_MAX, XL_NS_CHART, "showDLblsOverMax", GSF_XML_NO_CONTENT, NULL, 
NULL),
+    GSF_XML_IN_NODE (CHART, FLOOR, XL_NS_CHART, "floor", GSF_XML_NO_CONTENT, NULL, NULL),
+      GSF_XML_IN_NODE (FLOOR, THICKNESS, XL_NS_CHART, "thickness", GSF_XML_NO_CONTENT, NULL, NULL),
+      GSF_XML_IN_NODE (FLOOR, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+    GSF_XML_IN_NODE (CHART, SIDEWALL, XL_NS_CHART, "sideWall", GSF_XML_NO_CONTENT, NULL, NULL),
+      GSF_XML_IN_NODE (SIDEWALL, THICKNESS, XL_NS_CHART, "thickness", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (SIDEWALL, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+    GSF_XML_IN_NODE (CHART, BACKWALL, XL_NS_CHART, "backWall", GSF_XML_NO_CONTENT, NULL, NULL),
+      GSF_XML_IN_NODE (BACKWALL, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (BACKWALL, THICKNESS, XL_NS_CHART, "thickness", GSF_XML_2ND, NULL, NULL),
     GSF_XML_IN_NODE (CHART, PLOTAREA, XL_NS_CHART, "plotArea", GSF_XML_NO_CONTENT, &xlsx_plot_area, 
&xlsx_plot_area_end),
       GSF_XML_IN_NODE (PLOTAREA, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
       GSF_XML_IN_NODE_FULL (PLOTAREA, CAT_AXIS, XL_NS_CHART, "catAx", GSF_XML_NO_CONTENT, FALSE, TRUE,