X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=abb30cb530c7c1c85b3edd46afdd825fbe573fe6;hb=d98583b9425b8a053dc21b539203406bac74adc5;hp=a7eeaee9ef279f62c66ad66fd6fc36b766d0ac52;hpb=507ebaea36737618ef8265a60cd3e9005d9f3457;p=pspp

diff --git a/src/output/odt.c b/src/output/odt.c
index a7eeaee9ef..abb30cb530 100644
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -285,7 +285,6 @@ odt_create (struct file_handle *fh, enum settings_output_devices device_type,
             struct string_map *o UNUSED)
 {
   struct output_driver *d;
-  struct odt_driver *odt;
   struct zip_writer *zip;
   const char *file_name = fh_get_file_name (fh);
 
@@ -293,7 +292,7 @@ odt_create (struct file_handle *fh, enum settings_output_devices device_type,
   if (zip == NULL)
     return NULL;
 
-  odt = xzalloc (sizeof *odt);
+  struct odt_driver *odt = XZALLOC (struct odt_driver);
   d = &odt->driver;
 
   output_driver_init (d, &odt_driver_class, file_name, device_type);
@@ -446,8 +445,8 @@ write_table_item_cell (struct odt_driver *odt,
   xmlTextWriterWriteString (odt->content_wtr, _xml (ds_cstr (&body)));
   ds_destroy (&body);
 
-  write_footnotes (odt, pt, cell->value->footnote_indexes,
-                   cell->value->n_footnotes);
+  const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+  write_footnotes (odt, pt, ex->footnote_indexes, ex->n_footnotes);
 }
 
 static void
@@ -598,7 +597,7 @@ odt_submit (struct output_driver *driver, const struct output_item *item)
       break;
 
     case OUTPUT_ITEM_GROUP:
-      NOT_REACHED ();
+      break;
 
     case OUTPUT_ITEM_IMAGE:
       break;
@@ -614,9 +613,6 @@ odt_submit (struct output_driver *driver, const struct output_item *item)
     case OUTPUT_ITEM_PAGE_BREAK:
       break;
 
-    case OUTPUT_ITEM_PAGE_SETUP:
-      break;
-
     case OUTPUT_ITEM_TABLE:
       write_table (odt, item->table);
       break;