Use the gnumeric_reopen function

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

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 3fbbde1d21f605242ad1117b64345a155764c7e5..9f84fa1abeb9eab212e9f6c7af13585c8191095a 100644 (file)
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -36,12 +36,12 @@ struct spreadsheet_read_options
 
 struct spreadsheet_read_info
 {
-  char *file_name ;        /* The name of the file to open (in filename encoding) */
   bool read_names ;        /* True if the first row is to be used as the names of the variables */
   int asw ;                /* The width of string variables in the created dictionary */
 };
 
-int pseudo_base26 (const char *str);
+int ps26_to_int (const char *str);
+char * int_to_ps26 (int);
 
 bool convert_cell_ref (const char *ref,
                       int *col0, int *row0,
@@ -54,12 +54,15 @@ bool convert_cell_ref (const char *ref,
 
 enum spreadsheet_type
   {
+    SPREADSHEET_NONE,
     SPREADSHEET_GNUMERIC,
     SPREADSHEET_ODS
   };
 
 struct spreadsheet
 {
+  char *file_name;
+
   enum spreadsheet_type type;
 
   /* The total number of sheets in the "workbook" */
@@ -69,6 +72,9 @@ struct spreadsheet
   struct dictionary *dict;
 };
 
+
+char *create_cell_ref (int col0, int row0, int coli, int rowi);
+
 /* 
    Attempt to open the file called FILENAME as a spreadsheet.
    It is not known a priori, what type of spreadsheet FILENAME is, or