[gnumeric] also write formatting attched to empty cells to ODF

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

commit 47e2ef964d645812f7f89cbc451478498abf75a9
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue May 19 00:55:52 2009 -0600

    also write formatting attched to empty cells to ODF
    
    2009-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_save_automatic_character_styles): we
    	  also need to save the formats associated with any empty cell
    	(odf_write_empty_cell): also write attached formatting info to empty
    	  cells
    	(odf_write_sheet): we cannot bundle all empty cells but need to
    	  watch for format changes
---
 plugins/openoffice/ChangeLog          |    9 +++++
 plugins/openoffice/openoffice-write.c |   57 ++++++++++++++++++---------------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 723ca66..d851922 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-19  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-write.c (odf_save_automatic_character_styles): we
+	  also need to save the formats associated with any empty cell
+	(odf_write_empty_cell): also write attached formatting info to empty
+	  cells
+	(odf_write_sheet): we cannot bundle all empty cells but need to
+	  watch for format changes
+	
 2009-05-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-write.c (GnmOOExport): added field
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 3a4ed0c..3acf8e2 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -788,17 +788,10 @@ odf_save_automatic_character_styles (GnmOOExport *state)
 		
 		for (row = extent.start.row; row <= extent.end.row; row++) {
 			for (col = extent.start.col; col <= extent.end.col; col++) {
-				GnmCell *current_cell = sheet_cell_get (sheet, col, row);
-				if (current_cell != NULL) {
-					GnmStyle const *style;
-					
-					if (gnm_cell_is_empty (current_cell))
-						continue;
-					
-					style = sheet_style_get (sheet, col, row);
-					if (style != NULL)
-						odf_find_style (state, style, TRUE);
-				}
+				GnmStyle const *style;
+				style = sheet_style_get (sheet, col, row);
+				if (style != NULL)
+					odf_find_style (state, style, TRUE);
 			}
 		}
 		g_free (col_styles);
@@ -1045,7 +1038,7 @@ odf_cell_is_covered (Sheet const *sheet, GnmCell *current_cell,
 }
 
 static void
-odf_write_empty_cell (GnmOOExport *state, int *num)
+odf_write_empty_cell (GnmOOExport *state, int *num, GnmStyle const *style)
 {
 	if (*num > 0) {
 		gsf_xml_out_start_element (state->xml, TABLE "table-cell");
@@ -1053,6 +1046,12 @@ odf_write_empty_cell (GnmOOExport *state, int *num)
 			gsf_xml_out_add_int (state->xml,
 					     TABLE "number-columns-repeated",
 					     *num);
+		if (style != NULL) {
+			char const * name = odf_find_style (state, style, FALSE);
+			if (name != NULL)
+				gsf_xml_out_add_cstr (state->xml,
+						      TABLE "style-name", name);			
+		}
 		gsf_xml_out_end_element (state->xml);   /* table-cell */
 		*num = 0;
 	}
@@ -1363,9 +1362,6 @@ odf_write_sheet (GnmOOExport *state, Sheet const *sheet)
 	GnmStyle **col_styles = g_new (GnmStyle *, max_cols);
 	GnmRange  extent;
 	int i, col, row;
-	int null_cell;
-	int covered_cell;
-	GnmCellPos pos;
 	GSList *sheet_merges = NULL;
 	
 
@@ -1390,8 +1386,10 @@ odf_write_sheet (GnmOOExport *state, Sheet const *sheet)
 
 	for (row = extent.start.row; row <= extent.end.row; row++) {
 		ColRowInfo const *ci = sheet_row_get (sheet, row);
-		null_cell = extent.start.col;
-		covered_cell = 0;
+		GnmStyle const *null_style = NULL;
+		int null_cell = extent.start.col;
+		int covered_cell = 0;
+		GnmCellPos pos;
 		pos.row = row;
 
 		gsf_xml_out_start_element (state->xml, TABLE "table-row");
@@ -1408,28 +1406,35 @@ odf_write_sheet (GnmOOExport *state, Sheet const *sheet)
 
 			if (odf_cell_is_covered (sheet, current_cell, col, row,
 						merge_range, &sheet_merges)) {
-				if (null_cell >0)
-					odf_write_empty_cell (state, &null_cell);
+
+				odf_write_empty_cell (state, &null_cell, null_style);
+				
 				covered_cell++;
 				continue;
 			}
 			if ((merge_range == NULL) && (cc == NULL) &&
 			    gnm_cell_is_empty (current_cell)) {
-				if (covered_cell > 0)
-					odf_write_covered_cell (state, &covered_cell);
-				null_cell++;
+				GnmStyle const *this_style = sheet_style_get (sheet, col, row);
+				if ((null_cell == 0) || gnm_style_equal (null_style, this_style)) { 
+					null_style = this_style;
+					if (covered_cell > 0)
+						odf_write_covered_cell (state, &covered_cell);
+					null_cell++;
+				} else {
+					odf_write_empty_cell (state, &null_cell, null_style);
+					null_style = this_style;
+					null_cell = 1;
+				}
 				continue;
 			}
 
-			if (null_cell > 0)
-				odf_write_empty_cell (state, &null_cell);
+			odf_write_empty_cell (state, &null_cell, null_style);
 			if (covered_cell > 0)
 				odf_write_covered_cell (state, &covered_cell);
 			odf_write_cell (state, current_cell, merge_range, cc);
 
 		}
-		if (null_cell > 0)
-			odf_write_empty_cell (state, &null_cell);
+		odf_write_empty_cell (state, &null_cell, null_style);
 		if (covered_cell > 0)
 			odf_write_covered_cell (state, &covered_cell);