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

diff --combined src/ui/gui/page-file.c
index 3947c7901233f558ef52ab1bd4940e28a9fa4c29,2dd9f9ca1616670dec965af3311feb392dc11260..84b7928a27645689afc37a04a6268edbb1de33ff
--- 1/src/ui/gui/page-file.c
--- 2/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@@ -81,21 -81,12 +81,12 @@@ init_file (struct import_assistant *ia
  {
    enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
    struct file *file = &ia->file;
-   struct spreadsheet_read_options opts;
  
    file->lines = NULL;
    file->file_name = choose_file (parent_window, &file->encoding);
    if (file->file_name == NULL)
      return false;
  
-   opts.sheet_name = NULL;
-   opts.cell_range = NULL;
-   opts.sheet_index = 1;
- 
-   opts.read_names = true;
-   opts.asw = -1;
- 
- 
    if (ia->spreadsheet == NULL)
      ia->spreadsheet = gnumeric_probe (file->file_name, false);
  
@@@ -239,21 -230,6 +230,21 @@@ choose_file (GtkWindow *parent_window, 
    gtk_file_filter_add_mime_type (filter, "text/tab-separated-values");
    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
  
 +  filter = gtk_file_filter_new ();
 +  gtk_file_filter_set_name (filter, _("Gnumeric Spreadsheet Files"));
 +  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
 +  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 +
 +  filter = gtk_file_filter_new ();
 +  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);
 +
 +  filter = gtk_file_filter_new ();
 +  gtk_file_filter_set_name (filter, _("All Spreadsheet Files"));
 +  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
 +  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
 +  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
  
    gtk_file_chooser_set_extra_widget (
      GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));