projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The length of the string is now not always the
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-data-editor.c
diff --git
a/src/ui/gui/psppire-data-editor.c
b/src/ui/gui/psppire-data-editor.c
index e02cf730c7f381b1e7c81ef3b2bea247c0b92af8..38250f7ea6959a76ab18e6f1db1458ffb8ed2e0f 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-1646,20
+1646,18
@@
enum {
/* Perform data_out for case CC, variable V, appending to STRING */
static void
/* Perform data_out for case CC, variable V, appending to STRING */
static void
-data_out_g_string (GString *string, const struct variable *v,
+data_out_g_string (GString *string, const struct dictionary *dict,
+ const struct variable *v,
const struct ccase *cc)
{
const struct ccase *cc)
{
- char *buf ;
-
const struct fmt_spec *fs = var_get_print_format (v);
const union value *val = case_data (cc, v);
const struct fmt_spec *fs = var_get_print_format (v);
const union value *val = case_data (cc, v);
- buf = xzalloc (fs->w);
-
data_out (val, fs, buf
);
+
char *s = data_out (val, dict_get_encoding (dict), fs
);
- g_string_append
_len (string, buf, fs->w
);
+ g_string_append
(string, s
);
- g_free (
buf
);
+ g_free (
s
);
}
static GString *
}
static GString *
@@
-1689,7
+1687,7
@@
clip_to_text (void)
for (c = 0 ; c < var_cnt ; ++c)
{
const struct variable *v = dict_get_var (clip_dict, c);
for (c = 0 ; c < var_cnt ; ++c)
{
const struct variable *v = dict_get_var (clip_dict, c);
- data_out_g_string (string, v, cc);
+ data_out_g_string (string,
clip_dict,
v, cc);
if ( c < val_cnt - 1 )
g_string_append (string, "\t");
}
if ( c < val_cnt - 1 )
g_string_append (string, "\t");
}
@@
-1734,7
+1732,7
@@
clip_to_html (void)
{
const struct variable *v = dict_get_var (clip_dict, c);
g_string_append (string, "<td>");
{
const struct variable *v = dict_get_var (clip_dict, c);
g_string_append (string, "<td>");
- data_out_g_string (string, v, cc);
+ data_out_g_string (string,
clip_dict,
v, cc);
g_string_append (string, "</td>\n");
}
g_string_append (string, "</td>\n");
}