[gnumeric] simplification in odf_write_sheet

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

commit 113ef0817e2566380fb84926bb384a9c52f9de76
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Nov 4 20:47:32 2012 -0700

    simplification in odf_write_sheet
    
    2012-11-04  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_write_content_rows): remove unused arguments
    	and change all callers
    	(odf_write_sheet): don't worry about the extent here.

 plugins/openoffice/ChangeLog          |    6 ++++++
 plugins/openoffice/openoffice-write.c |   12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c2abcc4..99e0aa9 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-04  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-write.c (odf_write_content_rows): remove unused arguments
+	and change all callers
+	(odf_write_sheet): don't worry about the extent here.
+
 2012-11-03  Morten Welinder  <terra gnome org>
 
 	* openoffice-write.c (row_info_equal): Rename from row_style_eq.
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 51897a0..ab232d0 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3474,7 +3474,7 @@ enum {
 
 static void
 odf_write_content_rows (GnmOOExport *state, Sheet const *sheet, int from, int to,
-			G_GNUC_UNUSED int col_from, G_GNUC_UNUSED int col_to, int row_length,
+			int row_length,
 			GSList **sheet_merges, GnmPageBreaks *pb, GnmStyle **col_styles)
 {
 	int row;
@@ -3655,14 +3655,10 @@ odf_write_sheet (GnmOOExport *state)
 	int max_cols = gnm_sheet_get_max_cols (sheet);
 	int max_rows = gnm_sheet_get_max_rows (sheet);
 	GnmStyle **col_styles = g_new0 (GnmStyle *, max_cols);
-	GnmRange extent, cell_extent, r;
+	GnmRange r;
 	GSList *sheet_merges = NULL;
 	GnmPageBreaks *pb = sheet->print_info->page_breaks.v;
 
-	extent = sheet_get_extent (sheet, FALSE);
-	cell_extent = sheet_get_cells_extent (sheet);
-	extent = range_union (&extent, &cell_extent);
-
 	col_styles = sheet_style_most_common (sheet, TRUE);
 
 	/* ODF does not allow us to mark soft page breaks between columns */
@@ -3693,24 +3689,20 @@ odf_write_sheet (GnmOOExport *state)
 		if (repeat_top_start > 0)
 			odf_write_content_rows (state, sheet,
 						0, repeat_top_start,
-						extent.start.col, extent.end.col + 1,
 						max_cols, &sheet_merges, pb, col_styles);
 		gsf_xml_out_start_element
 			(state->xml, TABLE "table-header-rows");
 		odf_write_content_rows (state, sheet,
 					repeat_top_start, repeat_top_end + 1,
-					extent.start.col, extent.end.col + 1,
 					max_cols, &sheet_merges, pb, col_styles);
 		gsf_xml_out_end_element (state->xml);
 		if (repeat_top_end < max_rows)
 			odf_write_content_rows (state, sheet,
 						repeat_top_end + 1, max_rows,
-						extent.start.col, extent.end.col + 1,
 						max_cols, &sheet_merges, pb, col_styles);
 	} else
 		odf_write_content_rows (state, sheet,
 					0, max_rows,
-					extent.start.col, extent.end.col + 1,
 					max_cols, &sheet_merges, pb, col_styles);
 
 	g_slist_free_full (sheet_merges, g_free);