X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fspv%2Fspv.c;h=29c26c275b5bfdaa40389ddbecf0d727e58f3dd6;hb=6b58430f780708e9f5073db71f705e0f2eaacc58;hp=398ca59951557246319c514d6b093530cc14f92b;hpb=a22f79456929fc7edc9d65234ab05f4966c86679;p=pspp diff --git a/src/output/spv/spv.c b/src/output/spv/spv.c index 398ca59951..29c26c275b 100644 --- a/src/output/spv/spv.c +++ b/src/output/spv/spv.c @@ -260,7 +260,7 @@ spv_item_destroy (struct spv_item *item) free (item->children); pivot_table_unref (item->table); - spv_table_look_destroy (item->table_look); + pivot_table_look_unref (item->table_look); free (item->bin_member); free (item->xml_member); free (item->subtype); @@ -849,7 +849,7 @@ pivot_table_open_legacy (struct spv_item *item) return error; } -struct pivot_table * +const struct pivot_table * spv_item_get_table (const struct spv_item *item_) { struct spv_item *item = CONST_CAST (struct spv_item *, item_); @@ -1189,14 +1189,17 @@ spv_close (struct spv_reader *spv) void spv_item_set_table_look (struct spv_item *item, - const struct spv_table_look *look) + const struct pivot_table_look *look) { /* If this is a table, install the table look in it. (We can't just set item->table_look because light tables ignore it and legacy tables sometimes override it.) */ if (spv_item_is_table (item)) - spv_table_look_install (look, spv_item_get_table (item)); + { + spv_item_load (item); + pivot_table_set_look (item->table, look); + } for (size_t i = 0; i < item->n_children; i++) spv_item_set_table_look (item->children[i], look);