projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
output
/
tab.c
diff --git
a/src/output/tab.c
b/src/output/tab.c
index 7ce860f14e09c1e357eb11bafce1d3dba1d766b9..f5f1f1f84b6ba5ea4535213d23f84948e7a1fb43 100644
(file)
--- a/
src/output/tab.c
+++ b/
src/output/tab.c
@@
-24,10
+24,10
@@
#include <stdlib.h>
#include "data/data-out.h"
#include <stdlib.h>
#include "data/data-out.h"
-#include "data/dictionary.h"
#include "data/format.h"
#include "data/settings.h"
#include "data/value.h"
#include "data/format.h"
#include "data/settings.h"
#include "data/value.h"
+#include "data/variable.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
#include "libpspp/i18n.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
#include "libpspp/i18n.h"
@@
-360,7
+360,7
@@
tab_box (struct tab_table *t, int f_h, int f_v, int i_h, int i_v,
from V, displayed with format spec F. */
void
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
from V, displayed with format spec F. */
void
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
- const union value *v, const struct
dictionary *dict,
+ const union value *v, const struct
variable *var,
const struct fmt_spec *f)
{
char *contents;
const struct fmt_spec *f)
{
char *contents;
@@
-379,7
+379,9
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
}
#endif
}
#endif
- contents = data_out_pool (v, dict_get_encoding (dict), f, table->container);
+ contents = data_out_pool (v, var_get_encoding (var),
+ f != NULL ? f : var_get_print_format (var),
+ table->container);
table->cc[c + r * table->cf] = contents;
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = contents;
table->ct[c + r * table->cf] = opt;