output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / language / stats / crosstabs.q

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index 8c1fe5ba2fe505595212d81fa873288f2d2f5065..e5f174f00773788b18025a8d735d877939f3c5eb 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -56,7 +56,6 @@
 #include "libpspp/pool.h"
 #include "libpspp/str.h"
 #include "output/pivot-table.h"
-#include "output/chart-item.h"
 #include "output/charts/barchart.h"
 
 #include "gl/minmax.h"
@@ -786,9 +785,9 @@ postcalc (struct crosstabs_proc *proc)
           const struct variable **vars = xcalloc (n_vars, sizeof *vars);
           for (size_t i = 0; i < n_vars; i++)
             vars[i] = xt->vars[i].var;
-          chart_item_submit (barchart_create (vars, n_vars, _("Count"),
-                                              false,
-                                              xt->entries, xt->n_entries));
+          chart_submit (barchart_create (vars, n_vars, _("Count"),
+                                         false,
+                                         xt->entries, xt->n_entries));
           free (vars);
         }
     }
@@ -1239,7 +1238,8 @@ create_crosstab_table (struct crosstabs_proc *proc, struct crosstabulation *xt,
       ds_put_format (&title, ", %s=", var_to_string (var));
 
       /* Insert the formatted value of VAR without any leading spaces. */
-      s = data_out (value, var_get_encoding (var), var_get_print_format (var));
+      s = data_out (value, var_get_encoding (var), var_get_print_format (var),
+                    settings_get_fmt_settings ());
       ds_put_cstr (&title, s + strspn (s, " "));
       free (s);
     }