gnumeric r16541 - trunk/src

[mortenw svn gnome org]

Author: mortenw
Date: Wed Apr 30 13:39:59 2008
New Revision: 16541
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16541&view=rev

Log:
More sheet size work.



Modified:
   trunk/src/xml-sax-read.c

Modified: trunk/src/xml-sax-read.c
==============================================================================
--- trunk/src/xml-sax-read.c	(original)
+++ trunk/src/xml-sax-read.c	Wed Apr 30 13:39:59 2008
@@ -339,6 +339,8 @@
 	GList *delayed_names;
 	SheetObject *so;
 
+	int sheet_rows, sheet_cols;
+
 	GnmPageBreaks *page_breaks;
 } XMLSaxParseState;
 
@@ -463,13 +465,15 @@
 xml_sax_wb_sheetsize (GsfXMLIn *xin, xmlChar const **attrs)
 {
 	XMLSaxParseState *state = (XMLSaxParseState *)xin->user_state;
-	int tmpi;
+
+	state->sheet_cols = gnm_sheet_get_max_cols (NULL);
+	state->sheet_rows = gnm_sheet_get_max_rows (NULL);
 
 	for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
-		if (gnm_xml_attr_int (attrs, "gnm:Cols", &tmpi))
-			state->array_cols = tmpi;
-		else if (gnm_xml_attr_int (attrs, "gnm:Rows", &tmpi))
-			state->array_rows = tmpi;
+		if (gnm_xml_attr_int (attrs, "gnm:Cols", &state->sheet_cols))
+			; /* Nothing more */
+		else if (gnm_xml_attr_int (attrs, "gnm:Rows", &state->sheet_cols))
+			; /* Nothing more */
 		else
 			unknown_attr (xin, attrs);
 	}