[gnumeric] ODF import: ensure fields are NULL

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

commit 7066bc2560a2763793c790ea268a706b1748ee87
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Sep 13 10:25:17 2010 -0600

    ODF import: ensure fields are NULL
    
    2010-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (opendoc_content_dtd): text:p can
    	  occur in draw:line
    	(od_style_prop_chart): ensure fields are NULL.

 plugins/openoffice/ChangeLog         |   12 ++++++++++--
 plugins/openoffice/openoffice-read.c |    3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 8369d60..a61307d 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,8 +1,15 @@
 2010-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (opendoc_content_dtd): text:p can
+	  occur in draw:line
+	(od_style_prop_chart): ensure fields are NULL.
+
+2010-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (od_style_prop_chart): check for NULL
 	* openoffice-write.c (odf_write_line): an unknown 
-	  anchor->base.direction should behave like GOD_ANCHOR_DIR_UNKNOWN
+	  anchor->base.direction should behave like 
+	  GOD_ANCHOR_DIR_UNKNOWN
 	
 2010-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
 	
@@ -41,7 +48,8 @@
 	(odf_write_line): write marker info
 	(odf_write_styles): write arrow marker info
 	(odf_write_arrow_marker_info): new
-	(openoffice_file_save_real): create and delete the arrow hashes
+	(openoffice_file_save_real): create and delete the arrow 
+	  hashes
 
 2010-09-12  Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index a88b4e1..b0e35af 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4093,7 +4093,7 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
 			  state->default_style.cells != NULL);
 
 	if (style == NULL && state->default_style.cells != NULL) {
-		style = g_new (OOChartStyle, 1);
+		style = g_new0 (OOChartStyle, 1);
 	}
 		
 
@@ -7359,6 +7359,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
 	          GSF_XML_IN_NODE (TABLE_CELL, DRAW_RECT, OO_NS_DRAW, "rect", GSF_XML_NO_CONTENT, &odf_rect, &od_draw_frame_end),
 	            GSF_XML_IN_NODE (DRAW_RECT, DRAW_TEXT_BOX_TEXT, OO_NS_TEXT, "p", GSF_XML_CONTENT, NULL, &od_draw_text_box_p_end),
 	          GSF_XML_IN_NODE (TABLE_CELL, DRAW_LINE, OO_NS_DRAW, "line", GSF_XML_NO_CONTENT, &odf_line, &od_draw_frame_end),
+	            GSF_XML_IN_NODE (DRAW_LINE, DRAW_LINE_TEXT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, NULL),
 	          GSF_XML_IN_NODE (TABLE_CELL, DRAW_ELLIPSE, OO_NS_DRAW, "ellipse", GSF_XML_NO_CONTENT, &odf_ellipse, &od_draw_frame_end),
 	            GSF_XML_IN_NODE (DRAW_ELLIPSE, DRAW_TEXT_BOX_TEXT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, NULL), /* 2nd def */
 		  GSF_XML_IN_NODE (TABLE_CELL, DRAW_FRAME, OO_NS_DRAW, "frame", GSF_XML_NO_CONTENT, &od_draw_frame_start, &od_draw_frame_end),