Use the gnumeric_reopen function

[pspp] / src / data / gnumeric-reader.h

diff --git a/src/data/gnumeric-reader.h b/src/data/gnumeric-reader.h
index b313fc78768cf446975156c6d68647f277a72d4b..8c7518f808037b92b69f64d7eca0934546bb9764 100644 (file)
--- a/src/data/gnumeric-reader.h
+++ b/src/data/gnumeric-reader.h
@@ -20,21 +20,21 @@
 #include <stdbool.h>
 
 struct casereader;
+struct dictionary;
+struct spreadsheet_read_info;
+struct spreadsheet_read_options;
 
+struct spreadsheet *gnumeric_probe (const char *filename);
 
-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);
 
-struct dictionary;
+char * gnumeric_get_sheet_range (struct spreadsheet *s, int n);
+
+void gnumeric_destroy (struct spreadsheet *);
 
-struct casereader * gnumeric_open_reader (struct gnumeric_read_info *, struct dictionary **);
+struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
+                                         const struct spreadsheet_read_info *gri, 
+                                         struct spreadsheet_read_options *opts);
 
 
 #endif