projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Fix temporary filtering by a variable's value.
[pspp]
/
src
/
ui
/
gui
/
psppire-data-store.c
diff --git
a/src/ui/gui/psppire-data-store.c
b/src/ui/gui/psppire-data-store.c
index a97cbbb3e41e08d971ddb5dcda088a3c8a11b33b..9b1b26a21748a41ad1b203d182dc370f96bf9327 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2008, 2009 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009
, 2010
Free Software Foundation
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
@@
-793,7
+793,7
@@
get_column_button_label (const PsppireSheetModel *model, gint col)
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
if ( col >= psppire_dict_get_var_cnt (ds->dict) )
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
if ( col >= psppire_dict_get_var_cnt (ds->dict) )
- return
g_locale_to_utf8 (null_var_name, -1, 0, 0, 0
);
+ return
xstrdup (gettext (null_var_name)
);
pv = psppire_dict_get_variable (ds->dict, col);
pv = psppire_dict_get_variable (ds->dict, col);
@@
-879,7
+879,7
@@
psppire_data_store_insert_case (PsppireDataStore *ds,
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
- case_ref (cc);
+ c
c = c
ase_ref (cc);
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
@@
-959,7
+959,8
@@
psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx,
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
- && data_in (input, dict_get_encoding (dict->dict), fmt->type, 0, 0, 0, &value, width)
+ && data_in_msg (input, UTF8, fmt->type, &value, width,
+ dict_get_encoding (dict->dict))
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);