{
switch (s->type)
{
+#ifdef ODF_READ_SUPPORT
case SPREADSHEET_ODS:
ods_destroy (s);
break;
+#endif
+#ifdef GNM_READ_SUPPORT
case SPREADSHEET_GNUMERIC:
gnumeric_destroy (s);
break;
+#endif
default:
NOT_REACHED ();
break;
struct casereader *
-spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+spreadsheet_make_reader (struct spreadsheet *s UNUSED,
+ const struct spreadsheet_read_options *opts UNUSED)
{
+#ifdef ODS_READ_SUPPORT
if ( s->type == SPREADSHEET_ODS)
return ods_make_reader (s, opts);
+#endif
+#ifdef GNM_READ_SUPPORT
if ( s->type == SPREADSHEET_GNUMERIC)
return gnumeric_make_reader (s, opts);
+#endif
return NULL;
}
const char *
spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
{
+#ifdef ODF_READ_SUPPORT
if ( s->type == SPREADSHEET_ODS)
return ods_get_sheet_name (s, n);
-
+#endif
+#ifdef GNM_READ_SUPPORT
if ( s->type == SPREADSHEET_GNUMERIC)
return gnumeric_get_sheet_name (s, n);
+#endif
return NULL;
}
char *
spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
{
+#ifdef ODF_READ_SUPPORT
if ( s->type == SPREADSHEET_ODS)
return ods_get_sheet_range (s, n);
+#endif
+#ifdef GNM_READ_SUPPORT
if ( s->type == SPREADSHEET_GNUMERIC)
return gnumeric_get_sheet_range (s, n);
+#endif
return NULL;
}
return ret;
}
+
char *
-create_cell_ref (int col0, int row0, int coli, int rowi)
+create_cell_ref (int col0, int row0)
{
char *cs0 ;
- char *csi ;
char *s ;
if ( col0 < 0) return NULL;
- if ( rowi < 0) return NULL;
- if ( coli < 0) return NULL;
if ( row0 < 0) return NULL;
cs0 = int_to_ps26 (col0);
- csi = int_to_ps26 (coli);
- s = c_xasprintf ("%s%d:%s%d",
- cs0, row0 + 1,
- csi, rowi + 1);
+ s = c_xasprintf ("%s%d", cs0, row0 + 1);
+
free (cs0);
- free (csi);
+
+ return s;
+}
+
+char *
+create_cell_range (int col0, int row0, int coli, int rowi)
+{
+ char *s0 = create_cell_ref (col0, row0);
+ char *si = create_cell_ref (coli, rowi);
+
+ char *s = c_xasprintf ("%s:%s", s0, si);
+
+ free (s0);
+ free (si);
return s;
}