X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-casereader.c;h=485014dc81a20eac816f91ed34435033d2910676;hb=c44153d4b047bc82852df1e5a08e099ab09b14e6;hp=5d5154ef40c691eb871ef548b91e6bcef2572d7f;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp diff --git a/src/output/table-casereader.c b/src/output/table-casereader.c index 5d5154ef40..485014dc81 100644 --- a/src/output/table-casereader.c +++ b/src/output/table-casereader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 2009, 2011, 2013, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -110,13 +110,17 @@ 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->options = TAB_RIGHT; + cell->contents = &cell->inline_contents; + cell->n_contents = 1; + cell->inline_contents.options = TAB_RIGHT; + cell->inline_contents.table = NULL; + cell->inline_contents.n_footnotes = 0; if (tc->heading != NULL) { if (y == 0) { s = xstrdup (tc->heading); - cell->contents = s; + cell->inline_contents.text = s; cell->destructor = free_string; cell->destructor_aux = s; return; @@ -132,7 +136,7 @@ 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->contents = s; + cell->inline_contents.text = s; cell->destructor = free_string; cell->destructor_aux = s; }