Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / page-file.c

diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index 5254628bb8f96031a8faed732722234d1c1c5226..2647bb5c256006656c13d552783e8e26796d53da 100644 (file)
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@ -81,10 +81,7 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
 {
   enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
   struct file *file = &ia->file;
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-  struct spreadsheet_read_info sri;
   struct spreadsheet_read_options opts;
-  struct spreadsheet *spreadsheet = NULL;
 
   file->lines = NULL;
   file->file_name = choose_file (parent_window, &file->encoding);
@@ -95,20 +92,22 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
   opts.cell_range = NULL;
   opts.sheet_index = 1;
 
-  sri.read_names = true;
-  sri.asw = -1;
+  opts.read_names = true;
+  opts.asw = -1;
 
-  if (spreadsheet == NULL)
-    spreadsheet = gnumeric_probe (file->file_name);
-  
-  if (spreadsheet == NULL)
-    spreadsheet = ods_probe (file->file_name);
+  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
 
-  if (spreadsheet)
-    {
-      //      update_assistant (ia);
-    }
-  else
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = gnumeric_probe (file->file_name, false);
+
+  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
+
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = ods_probe (file->file_name, false);
+
+  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
+  
+  if (ia->spreadsheet == NULL)
     {
     struct string input;
     struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
@@ -251,7 +250,7 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("OpenOffice.Org Spreadsheet Files"));
+  gtk_file_filter_set_name (filter, _("OpenDocument Spreadsheet Files"));
   gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);