projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken expose callback in pspp-sheet-view
[pspp]
/
src
/
ui
/
gui
/
page-file.c
diff --git
a/src/ui/gui/page-file.c
b/src/ui/gui/page-file.c
index fdf6d6c912b61def31369cfe6f87b849ef4eb194..fdbda325f8ffdc0771cfb647a108a6124865874d 100644
(file)
--- a/
src/ui/gui/page-file.c
+++ b/
src/ui/gui/page-file.c
@@
-20,7
+20,6
@@
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
@@
-50,7
+49,6
@@
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
@@
-81,30
+79,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 sheet_spec_page *ssp = ia->sheet_spec;
- 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;
-
if (ia->spreadsheet == NULL)
if (ia->spreadsheet == NULL)
- ia->spreadsheet = gnumeric_probe (file->file_name);
+ ia->spreadsheet = gnumeric_probe (file->file_name
, false
);
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);
-
if (ia->spreadsheet == NULL)
{
struct string input;
if (ia->spreadsheet == NULL)
{
struct string input;
@@
-215,7
+201,7
@@
choose_file (GtkWindow *parent_window, gchar **encodingp)
g_object_set (dialog, "local-only", FALSE, NULL);
filter = gtk_file_filter_new ();
g_object_set (dialog, "local-only", FALSE, NULL);
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Text
f
iles"));
+ gtk_file_filter_set_name (filter, _("Text
F
iles"));
gtk_file_filter_add_mime_type (filter, "text/*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_filter_add_mime_type (filter, "text/*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
@@
-248,7
+234,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);
@@
-258,7
+244,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));