projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 48db5a2a16de868890b18792c3c705e4ffe3c400..2647bb5c256006656c13d552783e8e26796d53da 100644
(file)
--- a/
src/ui/gui/page-file.c
+++ b/
src/ui/gui/page-file.c
@@
-81,7
+81,6
@@
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;
{
enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
struct file *file = &ia->file;
- struct spreadsheet_read_info sri;
struct spreadsheet_read_options opts;
file->lines = NULL;
struct spreadsheet_read_options opts;
file->lines = NULL;
@@
-93,14
+92,18
@@
init_file (struct import_assistant *ia, GtkWindow *parent_window)
opts.cell_range = NULL;
opts.sheet_index = 1;
opts.cell_range = NULL;
opts.sheet_index = 1;
- sri.read_names = true;
- sri.asw = -1;
+ opts.read_names = true;
+ opts.asw = -1;
+
+ printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
if (ia->spreadsheet == NULL)
if (ia->spreadsheet == NULL)
- ia->spreadsheet = gnumeric_probe (file->file_name);
+ ia->spreadsheet = gnumeric_probe (file->file_name, false);
+
+ printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
if (ia->spreadsheet == NULL)
if (ia->spreadsheet == NULL)
- ia->spreadsheet = ods_probe (file->file_name);
+ ia->spreadsheet = ods_probe (file->file_name
, false
);
printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
@@
-247,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_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Open
Office.Org
Spreadsheet Files"));
+ gtk_file_filter_set_name (filter, _("Open
Document
Spreadsheet Files"));
gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);