X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.c;h=3c5de65822fa5f231fa6d09d0885ba54bcffca52;hb=dd415397beff015f3e9dabde00c95db263c99768;hp=02e5c2d3c04b18e3cc38dcce5359ac9fbbada59d;hpb=e2bba9cb07cce1652090b1931393d5739a3a9868;p=pspp

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index 02e5c2d3c0..3c5de65822 100644
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -29,6 +29,17 @@
 #include <gl/c-xvasprintf.h>
 #include <stdlib.h>
 
+#ifdef ODF_READ_SUPPORT
+const bool ODF_READING_SUPPORTED = true;
+#else
+const bool ODF_READING_SUPPORTED = false;
+#endif
+
+#ifdef GNM_READ_SUPPORT
+const bool GNM_READING_SUPPORTED = true;
+#else
+const bool GNM_READING_SUPPORTED = false;
+#endif
 
 void 
 spreadsheet_destroy (struct spreadsheet *s)
@@ -36,9 +47,12 @@ spreadsheet_destroy (struct spreadsheet *s)
   switch (s->type)
     {
     case SPREADSHEET_ODS:
+      assert (ODF_READING_SUPPORTED);
       ods_destroy (s);
       break;
+
     case SPREADSHEET_GNUMERIC:
+      assert (GNM_READING_SUPPORTED);
       gnumeric_destroy (s);
       break;
     default:
@@ -49,12 +63,16 @@ spreadsheet_destroy (struct spreadsheet *s)
 
 
 struct casereader * 
-spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+spreadsheet_make_reader (struct spreadsheet *s,
+                         const struct spreadsheet_read_options *opts)
 {
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_make_reader (s, opts);
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_make_reader (s, opts);
+  if (ODF_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_ODS)
+      return ods_make_reader (s, opts);
+
+  if (GNM_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_GNUMERIC)
+      return gnumeric_make_reader (s, opts);
 
   return NULL;
 }
@@ -62,23 +80,28 @@ spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_op
 const char * 
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_get_sheet_name (s, n);
+  if (ODF_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_ODS)
+      return ods_get_sheet_name (s, n);
 
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_get_sheet_name (s, n);
+  if (GNM_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_GNUMERIC)
+      return gnumeric_get_sheet_name (s, n);
 
   return NULL;
 }
 
+
 char * 
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_get_sheet_range (s, n);
+  if (ODF_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_ODS)
+      return ods_get_sheet_range (s, n);
 
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_get_sheet_range (s, n);
+  if (GNM_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_GNUMERIC)
+      return gnumeric_get_sheet_range (s, n);
 
   return NULL;
 }