table: Make table cells have exactly one piece of content again.

[pspp] / src / output / table-casereader.c

diff --git a/src/output/table-casereader.c b/src/output/table-casereader.c
index 5acb1a928d98aa72e3ffb1ea8bfb1f17a1485d85..018fa6328e546bee6c0000b9d5b8397dda1212de 100644 (file)
--- a/src/output/table-casereader.c
+++ b/src/output/table-casereader.c
@@ -110,16 +110,14 @@ table_casereader_get_cell (const struct table *t, int x, int y,
   cell->d[TABLE_HORZ][1] = x + 1;
   cell->d[TABLE_VERT][0] = y;
   cell->d[TABLE_VERT][1] = y + 1;
-  cell->contents = &cell->inline_contents;
-  cell->n_contents = 1;
-  cell->inline_contents.options = TAB_RIGHT;
-  cell->inline_contents.n_footnotes = 0;
+  cell->options = TAB_RIGHT;
+  cell->n_footnotes = 0;
   if (tc->heading != NULL)
     {
       if (y == 0)
         {
           s = xstrdup (tc->heading);
-          cell->inline_contents.text = s;
+          cell->text = s;
           cell->destructor = free_string;
           cell->destructor_aux = s;
           return;
@@ -135,14 +133,15 @@ table_casereader_get_cell (const struct table *t, int x, int y,
       s = data_out (case_data_idx (c, 0), UTF8, &tc->format);
       case_unref (c);
     }
-  cell->inline_contents.text = s;
+  cell->text = s;
   cell->destructor = free_string;
   cell->destructor_aux = s;
 }
 
 static int
 table_casereader_get_rule (const struct table *t, enum table_axis axis,
-                           int x UNUSED, int y)
+                           int x UNUSED, int y,
+                           struct cell_color *color UNUSED)
 {
   struct table_casereader *tc = table_casereader_cast (t);
   if (axis == TABLE_VERT)