gnumeric r17306 - in trunk: . src

[jody svn gnome org]

Author: jody
Date: Sun Apr  5 12:55:27 2009
New Revision: 17306
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17306&view=rev

Log:
Prep for XL2007 sized sheets, and some cleanup

Modified:
   trunk/ChangeLog
   trunk/src/gnumeric.h
   trunk/src/sheet-style.c

Modified: trunk/src/gnumeric.h
==============================================================================
--- trunk/src/gnumeric.h	(original)
+++ trunk/src/gnumeric.h	Sun Apr  5 12:55:27 2009
@@ -10,7 +10,7 @@
 
 /* Individual maxima for the dimensions.  See also gnm_sheet_valid_size.  */
 #define GNM_MAX_ROWS 0x1000000
-#define GNM_MAX_COLS 0x1000
+#define GNM_MAX_COLS 0x4000
 
 /* Standard size */
 #define GNM_DEFAULT_COLS 0x100

Modified: trunk/src/sheet-style.c
==============================================================================
--- trunk/src/sheet-style.c	(original)
+++ trunk/src/sheet-style.c	Sun Apr  5 12:55:27 2009
@@ -445,9 +445,9 @@
 	int l = 0, w = TILE_SIZE_COL, h = TILE_SIZE_ROW;
 
 	/* some simple sanity checks */
+	g_return_if_fail (IS_SHEET (sheet));
 	g_assert (gnm_sheet_get_max_cols (sheet) <= GNM_MAX_COLS);
 	g_assert (gnm_sheet_get_max_rows (sheet) <= GNM_MAX_ROWS);
-	g_return_if_fail (IS_SHEET (sheet));
 
 	while (w < gnm_sheet_get_max_cols (sheet)) {
 		w *= TILE_SIZE_COL;
@@ -459,10 +459,8 @@
 	}
 	if (l > sheet->tile_top_level)
 		sheet->tile_top_level = l;
-	h = 16;
-	w = 4;
-	sheet->max_height = 1;
-	sheet->max_width = 1;
+	h = TILE_SIZE_ROW;
+	w = TILE_SIZE_COL;
 	for (l = 0 ; l < sheet->tile_top_level; l++) {
 		h *= TILE_SIZE_ROW;
 		w *= TILE_SIZE_COL;