projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/covariance'
[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 58aa0b8f91f740ba2630763ac7703cad8a243148..036b9b7746cbabd9cf878662cdc63a435a84e877 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009
, 2010
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
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
@@
-1624,10
+1624,7
@@
data_sheet_set_clip (PsppireSheet *sheet)
clip_dict = dict_create ();
dict_set_encoding (clip_dict, dict_get_encoding (ds->dict->dict));
for (i = col0; i <= coli; i++)
clip_dict = dict_create ();
dict_set_encoding (clip_dict, dict_get_encoding (ds->dict->dict));
for (i = col0; i <= coli; i++)
- {
- const struct variable *old = dict_get_var (ds->dict->dict, i);
- dict_clone_var_assert (clip_dict, old, var_get_name (old));
- }
+ dict_clone_var_assert (clip_dict, dict_get_var (ds->dict->dict, i));
/* Construct clip data. */
map = case_map_by_name (ds->dict->dict, clip_dict);
/* Construct clip data. */
map = case_map_by_name (ds->dict->dict, clip_dict);
@@
-1656,14
+1653,13
@@
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 dictionary *dict,
- const struct variable *v,
+data_out_g_string (GString *string, const struct variable *v,
const struct ccase *cc)
{
const struct fmt_spec *fs = var_get_print_format (v);
const union value *val = case_data (cc, v);
const struct ccase *cc)
{
const struct fmt_spec *fs = var_get_print_format (v);
const union value *val = case_data (cc, v);
- char *s = data_out (val,
dict_get_encoding (dict
), fs);
+ char *s = data_out (val,
var_get_encoding (v
), fs);
g_string_append (string, s);
g_string_append (string, s);
@@
-1697,7
+1693,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,
clip_dict,
v, cc);
+ data_out_g_string (string, v, cc);
if ( c < val_cnt - 1 )
g_string_append (string, "\t");
}
if ( c < val_cnt - 1 )
g_string_append (string, "\t");
}
@@
-1744,7
+1740,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,
clip_dict,
v, cc);
+ data_out_g_string (string, v, cc);
g_string_append (string, "</td>\n");
}
g_string_append (string, "</td>\n");
}