From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 15 Feb 2013 12:22:29 +0000 (+0100)
Subject: Actually use the combobox setting
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91f64566b8174b3d1c004628f9f739cfd779b8ca;p=pspp

Actually use the combobox setting
---

diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c
index 59c9c76636..b29472761c 100644
--- a/src/ui/gui/page-sheet-spec.c
+++ b/src/ui/gui/page-sheet-spec.c
@@ -201,12 +201,13 @@ post_sheet_spec_page (struct import_assistant *ia)
   GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
 
   const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
+  GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
 
-  gint num = 1;
+  gint num = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box));
   
   ssp->opts.sheet_name = NULL;
   ssp->opts.cell_range = NULL;
-  ssp->opts.sheet_index = num;
+  ssp->opts.sheet_index = num + 1;
 
   if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop))
     {
@@ -220,17 +221,14 @@ post_sheet_spec_page (struct import_assistant *ia)
     {
     case SPREADSHEET_ODS:
       {
-	printf ("%s:%d\n", __FILE__, __LINE__);
 	creader = ods_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
 	dict = ia->spreadsheet->dict;
       }
       break;
     case SPREADSHEET_GNUMERIC:
       {
-	printf ("%s:%d\n",__FILE__, __LINE__);
 	creader = gnumeric_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
 	dict = ia->spreadsheet->dict;
-	printf ("%s:%d Reader %p Dict %p\n",__FILE__, __LINE__, creader, dict);
       }
       break;
     default: