[gnumeric] quieten complaint about nested text:span

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

commit 12df66d4443edea03eb7525a3a6c97dc1a8d5a75
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed May 13 01:16:31 2009 -0600

    quieten complaint about nested text:span
    
    2009-05-12  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (opendoc_content_dtd): permit nested text:span
---
 plugins/openoffice/ChangeLog         |    4 ++++
 plugins/openoffice/openoffice-read.c |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c105a65..58f90fb 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-12  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-write.c (opendoc_content_dtd): permit nested text:span
+
+2009-05-12  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-write.c (cb_odf_add_chars): new
 	(odf_new_markup): new
 	(odf_write_character_styles): new
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index c92d37a..7b4a2f6 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -2933,6 +2933,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
 		    GSF_XML_IN_NODE (CELL_TEXT, CELL_TEXT_S,    OO_NS_TEXT, "s", GSF_XML_NO_CONTENT, NULL, NULL),
 		    GSF_XML_IN_NODE (CELL_TEXT, CELL_TEXT_ADDR, OO_NS_TEXT, "a", GSF_XML_SHARED_CONTENT, NULL, NULL),
 		    GSF_XML_IN_NODE (CELL_TEXT, CELL_TEXT_SPAN, OO_NS_TEXT, "span", GSF_XML_SHARED_CONTENT, NULL, NULL),
+		    GSF_XML_IN_NODE (CELL_TEXT_SPAN, CELL_TEXT_SPAN, OO_NS_TEXT, "span", GSF_XML_NO_CONTENT, NULL, NULL),/* 2nd def */
 		      GSF_XML_IN_NODE (CELL_TEXT_SPAN, CELL_TEXT_SPAN_ADDR, OO_NS_TEXT, "a", GSF_XML_SHARED_CONTENT, NULL, NULL),
 		  GSF_XML_IN_NODE (TABLE_CELL, CELL_OBJECT, OO_NS_DRAW, "object", GSF_XML_NO_CONTENT, NULL, NULL),		/* ignore for now */
 		  GSF_XML_IN_NODE (TABLE_CELL, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_NO_CONTENT, NULL, NULL),			/* ignore for now */