[gnumeric] also read custom shapes from OO-generated ODF files.

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

commit 8d60c33246a9e6586138b6bb6e207d655040b485
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Aug 27 21:05:00 2012 -0600

    also read custom shapes from OO-generated ODF files.
    
    2012-08-27  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (opendoc_content_dtd): support custom-shapes
    	inside table-cells

 plugins/openoffice/ChangeLog         |    9 +++++++--
 plugins/openoffice/openoffice-read.c |    2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index f25f5d9..bc7de00 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-27  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (opendoc_content_dtd): support custom-shapes
+	inside table-cells
+
+2012-08-27  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (odf_parse_float): skip the 'e'
 	(odf_get_cs_formula_value): new
 	(odf_custom_shape_end): calculate all variables and
@@ -9,8 +14,8 @@
 
 2012-08-26  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* openoffice-read.c (odf_custom_shape_end): put doubles in teh hash since
-	goffice does not know gnm_float.
+	* openoffice-read.c (odf_custom_shape_end): put doubles in the hash
+	since goffice does not know gnm_float.
 
 2012-08-26  Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index b99bf86..cbe279c 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -10738,7 +10738,9 @@ static GsfXMLInNode const opendoc_content_dtd [] =
 	      GSF_XML_IN_NODE (TABLE_ROWS, SOFTPAGEBREAK, OO_NS_TEXT, "soft-page-break", GSF_XML_NO_CONTENT, NULL, NULL), /* 2nd def */
 	      GSF_XML_IN_NODE (TABLE_H_ROWS, SOFTPAGEBREAK, OO_NS_TEXT, "soft-page-break", GSF_XML_NO_CONTENT, NULL, NULL), /* 2nd def */
 		GSF_XML_IN_NODE (TABLE_ROW, TABLE_CELL, OO_NS_TABLE, "table-cell", GSF_XML_NO_CONTENT, &oo_cell_start, &oo_cell_end),
+		  GSF_XML_IN_NODE (TABLE_CELL, DRAW_CUSTOM_SHAPE, OO_NS_DRAW, "custom-shape", GSF_XML_NO_CONTENT, NULL, NULL),/* 2nd def */
 		  GSF_XML_IN_NODE (TABLE_CELL, CELL_TEXT, OO_NS_TEXT, "p", GSF_XML_CONTENT, &oo_cell_content_start, &oo_cell_content_end),
+		    GSF_XML_IN_NODE (CELL_TEXT, DRAW_CUSTOM_SHAPE, OO_NS_DRAW, "custom-shape", GSF_XML_NO_CONTENT, NULL, NULL),/* 2nd def */
 		    GSF_XML_IN_NODE (CELL_TEXT, TEXT_S,   OO_NS_TEXT, "s", GSF_XML_NO_CONTENT, NULL, NULL),/* 2nd def */
 		    GSF_XML_IN_NODE (CELL_TEXT, TEXT_ADDR, OO_NS_TEXT, "a", GSF_XML_SHARED_CONTENT, &oo_cell_content_link, NULL),
 	            GSF_XML_IN_NODE (CELL_TEXT, TEXT_LINE_BREAK, OO_NS_TEXT, "line-break", GSF_XML_NO_CONTENT, NULL, NULL),/* 2nd def */