Make GUI open either kind of spreadsheet

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index da2d6ea2aeb1f4f9f86230d004d77a17a5580ec8..4a85cb22ddbc05597e1e456bac10ef7b4dc372ac 100644 (file)
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -28,16 +28,6 @@
 #include <gl/c-xvasprintf.h>
 #include <stdlib.h>
 
-struct spreadsheet * 
-spreadsheet_open (const char *filename)
-{
-  struct spreadsheet *ss = NULL;
-
-  ss = ods_probe (filename, true);
-  
-  return ss;
-}
-
 void 
 spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
 {
@@ -47,19 +37,36 @@ spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
 struct casereader * 
 spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
 {
-  return ods_make_reader (s, opts);
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_make_reader (s, opts);
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_make_reader (s, opts);
+
+  return NULL;
 }
 
 const char * 
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
-  return ods_get_sheet_name (s, n);
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_name (s, n);
+
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_name (s, n);
+
+  return NULL;
 }
 
 char * 
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
-  return ods_get_sheet_range (s, n);
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_range (s, n);
+
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_range (s, n);
+
+  return NULL;
 }
 
 

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index a3fc9b4184027c483df53b8b1edc8e75bd68d877..5cfd81d7e1caf84b3eab536171bc98203bc878e7 100644 (file)
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -79,14 +79,6 @@ char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n);
 
 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
-   even if it is a spreadsheet at all.
-   If it fails to open, then it will return NULL without any error or
-   warning messages.
- */
-struct spreadsheet * spreadsheet_open (const char *filename);
 void spreadsheet_close (struct spreadsheet *);