[gnumeric] Hanfdle controls in shape collections

[Andreas J. Guelzow <guelzow src gnome org>]

commit 3f7ec6d4253a681fd7db8e9bcb2efeb24f7a19b7
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Jul 4 01:49:04 2020 -0600

    Hanfdle controls in shape collections

 plugins/openoffice/ChangeLog         | 5 ++++-
 plugins/openoffice/openoffice-read.c | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 94c96d2f9..ef02180b8 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,6 +1,9 @@
+2020-07-04  Andreas J. Guelzow <aguelzow pyrshep ca>
+    * openoffice-read.c: Adddraw_control to draw:g
+
 2020-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-       * openoffice-read.c (oo_cell_start): do not ignore teh value-type
+       * openoffice-read.c (oo_cell_start): do not ignore the value-type
        a missing value type means the cell is empty/blank
 
 2020-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index e97aad6e3..af97171a1 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -12350,6 +12350,7 @@ GSF_XML_IN_NODE (OFFICE_STYLES, PAGE_MASTER, OO_NS_STYLE, "page-master", GSF_XML
          GSF_XML_IN_NODE (TABLE_CELL, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_NO_CONTENT, NULL, NULL),        
  /* ignore for now */
            GSF_XML_IN_NODE (CELL_GRAPHIC, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_2ND, NULL, NULL),
            GSF_XML_IN_NODE (CELL_GRAPHIC, DRAW_POLYLINE, OO_NS_DRAW, "polyline", GSF_XML_NO_CONTENT, NULL, 
NULL),
+            GSF_XML_IN_NODE (CELL_GRAPHIC, CELL_CONTROL, OO_NS_DRAW, "control", GSF_XML_2ND, NULL, NULL),
          GSF_XML_IN_NODE (TABLE_CELL, DRAW_LINE, OO_NS_DRAW, "line", GSF_XML_NO_CONTENT, &odf_line, 
&odf_line_end),
             GSF_XML_IN_NODE (DRAW_LINE, IGNORED_TEXT_CONTENT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, 
NULL), /* ignore for now */
        GSF_XML_IN_NODE (TABLE_ROW, TABLE_COVERED_CELL, OO_NS_TABLE, "covered-table-cell", 
GSF_XML_NO_CONTENT, &oo_covered_cell_start, &oo_covered_cell_end),
@@ -12519,6 +12520,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
                      GSF_XML_IN_NODE (CHART_TABLE_CELL, CHART_CELL_P, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, 
NULL, NULL),
                      GSF_XML_IN_NODE (CHART_TABLE_CELL, CHART_CELL_DRAW_G, OO_NS_DRAW, "g", 
GSF_XML_NO_CONTENT, NULL, NULL),
                        GSF_XML_IN_NODE (CHART_CELL_DRAW_G, CHART_CELL_SVG_DESC, OO_NS_SVG, "desc", 
GSF_XML_NO_CONTENT, NULL, NULL),
+                       
                GSF_XML_IN_NODE (CHART_TABLE, CHART_TABLE_COLS, OO_NS_TABLE, "table-columns", 
GSF_XML_NO_CONTENT, NULL, NULL),
                  GSF_XML_IN_NODE (CHART_TABLE_COLS, CHART_TABLE_COL, OO_NS_TABLE, "table-column", 
GSF_XML_NO_CONTENT, NULL, NULL),
                GSF_XML_IN_NODE (CHART_TABLE, CHART_TABLE_HROWS, OO_NS_TABLE, "table-header-rows", 
GSF_XML_NO_CONTENT, NULL, NULL),
@@ -12570,7 +12572,8 @@ static GsfXMLInNode const opendoc_content_dtd [] =
                GSF_XML_IN_NODE (SHEET_SELECTIONS, SELECTION, OO_GNUM_NS_EXT, "selection", 
GSF_XML_NO_CONTENT, &odf_selection_range, NULL),
              GSF_XML_IN_NODE (TABLE, TABLE_SOURCE, OO_NS_TABLE, "table-source", GSF_XML_NO_CONTENT, NULL, 
NULL),
              GSF_XML_IN_NODE (TABLE, TABLE_SHAPES, OO_NS_TABLE, "shapes", GSF_XML_NO_CONTENT, &odf_shapes, 
&odf_shapes_end),
-                 GSF_XML_IN_NODE (TABLE_SHAPES, DRAW_FRAME, OO_NS_DRAW, "frame", GSF_XML_NO_CONTENT, 
&od_draw_frame_start, &od_draw_frame_end),
+                  GSF_XML_IN_NODE (TABLE_SHAPES, DRAW_CONTROL_SHAPES, OO_NS_DRAW, "control", 
GSF_XML_NO_CONTENT, NULL, NULL),
+                 GSF_XML_IN_NODE (TABLE_SHAPES, DRAW_FRAME, OO_NS_DRAW, "frame", GSF_XML_NO_CONTENT, 
&od_draw_frame_start, &od_draw_frame_end),
                  GSF_XML_IN_NODE (TABLE_SHAPES, DRAW_CAPTION, OO_NS_DRAW, "caption", GSF_XML_NO_CONTENT, 
&odf_caption, &od_draw_text_frame_end),
                    GSF_XML_IN_NODE (DRAW_CAPTION, TEXT_CONTENT, OO_NS_TEXT, "p", GSF_XML_2ND, NULL, NULL),
                  GSF_XML_IN_NODE (TABLE_SHAPES, DRAW_CUSTOM_SHAPE, OO_NS_DRAW, "custom-shape", 
GSF_XML_NO_CONTENT, &odf_custom_shape, &odf_custom_shape_end),
@@ -12633,7 +12636,8 @@ static GsfXMLInNode const opendoc_content_dtd [] =
                  GSF_XML_IN_NODE (TABLE_CELL, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_NO_CONTENT, NULL, 
NULL),                  /* ignore for now */
                    GSF_XML_IN_NODE (CELL_GRAPHIC, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_2ND, NULL, NULL),
                    GSF_XML_IN_NODE (CELL_GRAPHIC, DRAW_POLYLINE, OO_NS_DRAW, "polyline", GSF_XML_NO_CONTENT, 
NULL, NULL),
-                 GSF_XML_IN_NODE (TABLE_CELL, DRAW_CONTROL, OO_NS_DRAW, "control", GSF_XML_NO_CONTENT, 
&od_draw_control_start, NULL),
+                   GSF_XML_IN_NODE (CELL_GRAPHIC, DRAW_CONTROL, OO_NS_DRAW, "control", GSF_XML_NO_CONTENT, 
&od_draw_control_start, NULL),
+                 GSF_XML_IN_NODE (TABLE_CELL, DRAW_CONTROL, OO_NS_DRAW, "control", GSF_XML_2ND, NULL, NULL),
                  GSF_XML_IN_NODE (TABLE_CELL, DRAW_RECT, OO_NS_DRAW, "rect", GSF_XML_2ND, NULL, NULL),
                  GSF_XML_IN_NODE (TABLE_CELL, DRAW_LINE, OO_NS_DRAW, "line", GSF_XML_2ND, NULL, NULL),
                  GSF_XML_IN_NODE (TABLE_CELL, DRAW_ELLIPSE, OO_NS_DRAW, "ellipse", GSF_XML_2ND, NULL, NULL),