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/stable'
[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 990a134c423ff3c24090d04615b6d22b3b837d07..38250f7ea6959a76ab18e6f1db1458ffb8ed2e0f 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-744,15
+744,10
@@
update_data_ref_entry (const PsppireSheet *sheet,
gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
var_get_name (var));
gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
var_get_name (var));
- gchar *s = recode_string (UTF8,
- psppire_dict_encoding (data_store->dict),
- text, -1);
- g_free (text);
-
- gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), s);
+ gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), text);
- g_free (
s
);
+ g_free (
text
);
}
else
goto blank_entry;
}
else
goto blank_entry;
@@
-1331,10
+1326,14
@@
psppire_data_editor_insert_case (PsppireDataEditor *de)
{
glong posn = -1;
{
glong posn = -1;
- if ( de->data_sheet[0]->state == PSPPIRE_SHEET_ROW_SELECTED )
- posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
+ if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status == PSPPIRE_SHEET_ROW_SELECTED )
+ {
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
+ }
else
else
- posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row;
+ {
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row;
+ }
if ( posn == -1 ) posn = 0;
if ( posn == -1 ) posn = 0;
@@
-1622,7
+1621,7
@@
data_sheet_set_clip (PsppireSheet *sheet)
/* 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);
- writer = autopaging_writer_create (dict_get_
next_value_idx
(clip_dict));
+ writer = autopaging_writer_create (dict_get_
proto
(clip_dict));
for (i = range.row0; i <= range.rowi ; ++i )
{
struct ccase *old = psppire_data_store_get_case (ds, i);
for (i = range.row0; i <= range.rowi ; ++i )
{
struct ccase *old = psppire_data_store_get_case (ds, i);
@@
-1647,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 *
@@
-1669,7
+1666,7
@@
clip_to_text (void)
casenumber r;
GString *string;
casenumber r;
GString *string;
- const size_t val_cnt = case
reader_get_value_cnt (clip_datasheet
);
+ const size_t val_cnt = case
proto_get_n_widths (casereader_get_proto (clip_datasheet)
);
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
@@
-1690,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");
}
@@
-1711,7
+1708,7
@@
clip_to_html (void)
casenumber r;
GString *string;
casenumber r;
GString *string;
- const size_t val_cnt = case
reader_get_value_cnt (clip_datasheet
);
+ const size_t val_cnt = case
proto_get_n_widths (casereader_get_proto (clip_datasheet)
);
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
@@
-1735,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");
}