[gnumeric] Don't make the ODF files grow

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

commit f9dc83c07e1528d892990240b5dde97889f85d63
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Jun 16 21:14:47 2009 -0600

    Don't make the ODF files grow
    
    2009-06-16 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_write_sheet): don't confuse rows and cols
    	* openoffice-read.c (opendoc_content_dtd): add annotation tags

 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-read.c  |    3 +++
 plugins/openoffice/openoffice-write.c |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index e1713b1..00b55fb 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-16 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-write.c (odf_write_sheet): don't confuse rows and cols
+	* openoffice-read.c (opendoc_content_dtd): add annotation tags
+
+2009-06-16 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-write.c (odf_write_comment): new
 	(equal_style): deleted
 	(odf_write_empty_cell): change arguments and adjust all callers.
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 02b9a78..69b30c7 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3516,6 +3516,9 @@ static GsfXMLInNode const opendoc_content_dtd [] =
 		  GSF_XML_IN_NODE (TABLE_CELL, DRAW_FRAME, OO_NS_DRAW, "frame", GSF_XML_NO_CONTENT, &od_draw_frame, NULL),
 		    GSF_XML_IN_NODE (DRAW_FRAME, DRAW_OBJECT, OO_NS_DRAW, "object", GSF_XML_NO_CONTENT, &od_draw_object, NULL),
 		    GSF_XML_IN_NODE (DRAW_FRAME, DRAW_IMAGE, OO_NS_DRAW, "image", GSF_XML_NO_CONTENT, &od_draw_image, NULL),
+	          GSF_XML_IN_NODE (TABLE_CELL, CELL_ANNOTATION, OO_NS_OFFICE, "annotation", GSF_XML_NO_CONTENT, NULL, NULL),
+	            GSF_XML_IN_NODE (CELL_ANNOTATION, CELL_ANNOTATION_TEXT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, NULL),
+	            GSF_XML_IN_NODE (CELL_ANNOTATION, CELL_ANNOTATION_AUTHOR, OO_NS_DC, "creator", GSF_XML_NO_CONTENT, NULL, NULL),
 		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),
 
 	      GSF_XML_IN_NODE (TABLE, TABLE_COL_GROUP, OO_NS_TABLE, "table-column-group", GSF_XML_NO_CONTENT, NULL, NULL),
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 58c77e8..a6d64d2 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -1827,7 +1827,7 @@ odf_write_sheet (GnmOOExport *state, Sheet const *sheet)
 				extent.start.row, extent.end.row + 1, 
 				extent.start.col, extent.end.col + 1, 
 				max_cols, &sheet_merges, pb, col_styles);
-	odf_write_styled_empty_rows (state, sheet, extent.end.col + 1, max_rows, 
+	odf_write_styled_empty_rows (state, sheet, extent.end.row + 1, max_rows, 
 				     max_cols, pb, col_styles);
 
 	go_slist_free_custom (sheet_merges, g_free);