X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fgnumeric-reader.h;h=1f5a32e3a48b7cd519d41b143015d70ce8c671ea;hb=01cbd30a9b6d38fae395620d2fcc49052d8e8b0f;hp=b313fc78768cf446975156c6d68647f277a72d4b;hpb=9ade26c8349b4434008c46cf09bc7473ec743972;p=pspp

diff --git a/src/data/gnumeric-reader.h b/src/data/gnumeric-reader.h
index b313fc7876..1f5a32e3a4 100644
--- a/src/data/gnumeric-reader.h
+++ b/src/data/gnumeric-reader.h
@@ -20,21 +20,19 @@
 #include <stdbool.h>
 
 struct casereader;
+struct dictionary;
+struct spreadsheet_read_info;
+struct spreadsheet_read_options;
 
+struct spreadsheet *gnumeric_probe (const char *filename, bool report_errors);
 
-struct gnumeric_read_info
-{
-  char *sheet_name ;            /* In UTF-8. */
-  char *file_name ;             /* In filename encoding. */
-  char *cell_range ;            /* In UTF-8. */
-  int sheet_index ;
-  bool read_names ;
-  int asw ;
-};
+const char * gnumeric_get_sheet_name (struct spreadsheet *s, int n);
+char * gnumeric_get_sheet_range (struct spreadsheet *s, int n);
 
-struct dictionary;
+struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
+					  const struct spreadsheet_read_options *opts);
 
-struct casereader * gnumeric_open_reader (struct gnumeric_read_info *, struct dictionary **);
+void gnumeric_destroy (struct spreadsheet *r);
 
 
 #endif