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-sheet-spec.c
diff --git
a/src/ui/gui/page-sheet-spec.c
b/src/ui/gui/page-sheet-spec.c
index 9aa16b592544e8e1ed34f7a27ad5a45cb7390926..3d92bfe4100929a074d6718a76c98115b23b1de0 100644
(file)
--- a/
src/ui/gui/page-sheet-spec.c
+++ b/
src/ui/gui/page-sheet-spec.c
@@
-78,7
+78,6
@@
struct sheet_spec_page
struct casereader *reader;
struct dictionary *dict;
struct casereader *reader;
struct dictionary *dict;
- struct spreadsheet_read_info sri;
struct spreadsheet_read_options opts;
};
struct spreadsheet_read_options opts;
};
@@
-102,7
+101,7
@@
sheet_spec_gen_syntax (const struct import_assistant *ia)
(ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS",
ia->file.file_name,
ssp->opts.sheet_index,
(ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS",
ia->file.file_name,
ssp->opts.sheet_index,
- ssp->
sri
.read_names ? "ON" : "OFF");
+ ssp->
opts
.read_names ? "ON" : "OFF");
if (range && 0 != strcmp ("", range))
if (range && 0 != strcmp ("", range))
@@
-215,20
+214,15
@@
post_sheet_spec_page (struct import_assistant *ia)
ssp->opts.cell_range = range;
}
ssp->opts.cell_range = range;
}
- ssp->
sri
.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
- ssp->
sri
.asw = -1;
+ ssp->
opts
.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
+ ssp->
opts
.asw = -1;
switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
- {
- creader = ods_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
- dict = ia->spreadsheet->dict;
- }
- break;
case SPREADSHEET_GNUMERIC:
{
case SPREADSHEET_GNUMERIC:
{
- creader =
gnumeric_make_reader (ia->spreadsheet, &ssp->sri
, &ssp->opts);
+ creader =
spreadsheet_make_reader (ia->spreadsheet
, &ssp->opts);
dict = ia->spreadsheet->dict;
}
break;
dict = ia->spreadsheet->dict;
}
break;