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 0e0a496de60c5579d6b4c31784ccb916a043f40f..84b7928a27645689afc37a04a6268edbb1de33ff 100644
(file)
--- a/
src/ui/gui/page-file.c
+++ b/
src/ui/gui/page-file.c
@@
-81,33
+81,18
@@
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;
file->file_name = choose_file (parent_window, &file->encoding);
if (file->file_name == NULL)
return false;
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;
-
- sri.read_names = true;
- sri.asw = -1;
-
- printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
if (ia->spreadsheet == NULL)
ia->spreadsheet = gnumeric_probe (file->file_name, false);
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);
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;
if (ia->spreadsheet == NULL)
{
struct string input;
@@
-251,7
+236,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);
@@
-261,7
+246,6
@@
choose_file (GtkWindow *parent_window, gchar **encodingp)
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);
-
gtk_file_chooser_set_extra_widget (
GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));
gtk_file_chooser_set_extra_widget (
GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));