From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 29 Jan 2013 19:04:59 +0000 (+0100)
Subject: Dont show range if it is null
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f34021711b79c96bd0d3c374c154efa770e29cfb;p=pspp

Dont show range if it is null
---

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index e34fcb38fa..2b4178835a 100644
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -126,9 +126,18 @@ int_to_ps26 (int i)
 char *
 create_cell_ref (int col0, int row0, int coli, int rowi)
 {
-  char *cs0 =  int_to_ps26 (col0);
-  char *csi =  int_to_ps26 (coli);
-  char *s =  c_xasprintf ("%s%d:%s%ld",
+  char *cs0 ;
+  char *csi ;
+  char *s ;
+
+  if ( col0 < 0) return NULL;
+  if ( rowi < 0) return NULL;
+  if ( coli < 0) return NULL;
+  if ( row0 < 0) return NULL;
+
+  cs0 =  int_to_ps26 (col0);
+  csi =  int_to_ps26 (coli);
+  s =  c_xasprintf ("%s%d:%s%ld",
 			 cs0, row0 + 1,
 			 csi, rowi + 1);
   free (cs0);
diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c
index 501dc1b86b..fe8f90f3b7 100644
--- a/src/ui/gui/page-sheet-spec.c
+++ b/src/ui/gui/page-sheet-spec.c
@@ -91,7 +91,7 @@ on_sheet_combo_changed (GtkComboBox *cb, struct import_assistant *ia)
 
   gtk_combo_box_get_active_iter (cb, &iter);
   gtk_tree_model_get (model, &iter, PSPPIRE_SPREADSHEET_MODEL_COL_RANGE, &range, -1);
-  gtk_entry_set_text (GTK_ENTRY (range_entry), range);
+  gtk_entry_set_text (GTK_ENTRY (range_entry), range ?  range : "");
   g_free (range);
 }