#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.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"
struct casereader *reader;
struct dictionary *dict;
- struct spreadsheet_read_info sri;
struct spreadsheet_read_options opts;
};
(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))
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:
- {
- creader = ods_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
- dict = ia->spreadsheet->dict;
- }
- break;
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;