summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
eb06da6)
There was a typo which caused the import of ODS files in the gui to
not properly function. This change fixes the typo, but also re-arranges
the code such that similar errors are less likely to go unnoticed in the
future. It also brings the code more in concord with the GNU Coding
Standards (which were written that way exactly to prevent these errors).
Fixes bug #41657
- A problem with the Means dialog has been resolved (bug #41433).
- A problem with the Means dialog has been resolved (bug #41433).
+ - Several problems related to the input of spreadsheets have been
+ fixed (bug #41657, #41620
+
* System file related improvements:
- With ENCODING="DETECT", SYSFILE INFO can now help the user to
* System file related improvements:
- With ENCODING="DETECT", SYSFILE INFO can now help the user to
#include <gl/c-xvasprintf.h>
#include <stdlib.h>
#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)
{
switch (s->type)
{
void
spreadsheet_destroy (struct spreadsheet *s)
{
switch (s->type)
{
+ assert (ODF_READING_SUPPORTED);
-#endif
-#ifdef GNM_READ_SUPPORT
case SPREADSHEET_GNUMERIC:
case SPREADSHEET_GNUMERIC:
+ assert (GNM_READING_SUPPORTED);
gnumeric_destroy (s);
break;
gnumeric_destroy (s);
break;
default:
NOT_REACHED ();
break;
default:
NOT_REACHED ();
break;
-spreadsheet_make_reader (struct spreadsheet *s UNUSED,
- const struct spreadsheet_read_options *opts UNUSED)
+spreadsheet_make_reader (struct spreadsheet *s,
+ const struct spreadsheet_read_options *opts)
-#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
+ 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);
const char *
spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
{
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
+ if (ODF_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_name (s, n);
+
+ if (GNM_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_name (s, n);
char *
spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
{
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
+ if (ODF_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_range (s, n);
-#ifdef GNM_READ_SUPPORT
- if ( s->type == SPREADSHEET_GNUMERIC)
- return gnumeric_get_sheet_range (s, n);
-#endif
+ if (GNM_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_range (s, n);