[gnumeric] Sheet size: respect any valid size.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] Sheet size: respect any valid size.
- Date: Sat, 9 May 2009 20:54:23 -0400 (EDT)
commit 87c677ec6abc9d7d8367b0a5d7e609351b6d06ad
Author: Morten Welinder <terra gnome org>
Date: Sat May 9 20:54:09 2009 -0400
Sheet size: respect any valid size.
---
ChangeLog | 5 +++++
src/gnumeric-gconf.c | 6 ++++--
src/workbook.c | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b32a8b3..3822838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-05-09 Morten Welinder <terra gnome org>
+ * src/gnumeric-gconf.c (gnm_gconf_set_workbook_ncols,
+ gnm_gconf_set_workbook_nrows): Respect any valid size.
+
+ * src/workbook.c (workbook_new_with_sheets): Ditto.
+
* src/gui-clipboard.c (table_cellregion_write): Explicitly size
the temporary sheet.
diff --git a/src/gnumeric-gconf.c b/src/gnumeric-gconf.c
index b0ff364..d629c59 100644
--- a/src/gnumeric-gconf.c
+++ b/src/gnumeric-gconf.c
@@ -861,7 +861,8 @@ gnm_gconf_set_workbook_nrows (gint val)
while (n < val && n < GNM_MAX_ROWS)
n <<= 1;
prefs.row_number = n;
- gnm_sheet_suggest_size (&prefs.col_number, &prefs.row_number);
+ if (!gnm_sheet_valid_size (prefs.col_number, prefs.row_number))
+ gnm_sheet_suggest_size (&prefs.col_number, &prefs.row_number);
go_conf_set_int (root, GNM_CONF_WORKBOOK_NROWS, prefs.row_number);
go_conf_set_int (root, GNM_CONF_WORKBOOK_NCOLS, prefs.col_number);
}
@@ -873,7 +874,8 @@ gnm_gconf_set_workbook_ncols (gint val)
while (n < val && n < GNM_MAX_COLS)
n <<= 1;
prefs.col_number = n;
- gnm_sheet_suggest_size (&prefs.col_number, &prefs.row_number);
+ if (!gnm_sheet_valid_size (prefs.col_number, prefs.row_number))
+ gnm_sheet_suggest_size (&prefs.col_number, &prefs.row_number);
go_conf_set_int (root, GNM_CONF_WORKBOOK_NROWS, prefs.row_number);
go_conf_set_int (root, GNM_CONF_WORKBOOK_NCOLS, prefs.col_number);
}
diff --git a/src/workbook.c b/src/workbook.c
index b3319c0..e20ec77 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -363,7 +363,8 @@ workbook_new_with_sheets (int sheet_count)
Workbook *wb = workbook_new ();
int cols = gnm_app_prefs->col_number;
int rows = gnm_app_prefs->row_number;
- gnm_sheet_suggest_size (&cols, &rows);
+ if (!gnm_sheet_valid_size (cols, rows))
+ gnm_sheet_suggest_size (&cols, &rows);
while (sheet_count-- > 0)
workbook_sheet_add (wb, -1, cols, rows);
go_doc_set_dirty (GO_DOC (wb), FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]