projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/ui/gui/psppire-dialog-action-regression.c (generate_syntax): Reduce scope of...
[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 0310601501c903de5d1f09bd3fa6ee6a8d559df0..4662978bd3a3de3ab9e68539cfd27c20f2f866e0 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-164,7
+164,8
@@
psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row,
if (vp == NULL)
{
xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
if (vp == NULL)
{
xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
- fmt->type, &val, width, "UTF-8");
+ fmt->type, settings_get_fmt_settings (),
+ &val, width, "UTF-8");
}
GVariant *vrnt = value_variant_new (&val, width);
}
GVariant *vrnt = value_variant_new (&val, width);
@@
-290,7
+291,7
@@
psppire_data_store_class_init (PsppireDataStoreClass *class)
GObjectClass *object_class;
parent_class = g_type_class_peek_parent (class);
GObjectClass *object_class;
parent_class = g_type_class_peek_parent (class);
- object_class =
(GObjectClass*) class
;
+ object_class =
G_OBJECT_CLASS (class)
;
object_class->finalize = psppire_data_store_finalize;
object_class->dispose = psppire_data_store_dispose;
object_class->finalize = psppire_data_store_finalize;
object_class->dispose = psppire_data_store_dispose;
@@
-388,11
+389,13
@@
resize_datum (const union value *old, union value *new, const void *aux_)
int new_width = var_get_width (aux->new_variable);
const char *enc = dict_get_encoding (aux->dict);
const struct fmt_spec *newfmt = var_get_print_format (aux->new_variable);
int new_width = var_get_width (aux->new_variable);
const char *enc = dict_get_encoding (aux->dict);
const struct fmt_spec *newfmt = var_get_print_format (aux->new_variable);
- char *s = data_out (old, enc, var_get_print_format (aux->old_variable));
+ char *s = data_out (old, enc, var_get_print_format (aux->old_variable),
+ settings_get_fmt_settings ());
enum fmt_type type = (fmt_usable_for_input (newfmt->type)
? newfmt->type
: FMT_DOLLAR);
enum fmt_type type = (fmt_usable_for_input (newfmt->type)
? newfmt->type
: FMT_DOLLAR);
- free (data_in (ss_cstr (s), enc, type, new, new_width, enc));
+ free (data_in (ss_cstr (s), enc, type, settings_get_fmt_settings (),
+ new, new_width, enc));
free (s);
}
free (s);
}
@@
-704,11
+707,10
@@
psppire_data_store_clear (PsppireDataStore *ds)
struct casereader *
psppire_data_store_get_reader (PsppireDataStore *ds)
{
struct casereader *
psppire_data_store_get_reader (PsppireDataStore *ds)
{
- int i;
struct casereader *reader ;
if (ds->dict)
struct casereader *reader ;
if (ds->dict)
- for (i = 0 ; i < n_dict_signals; ++i)
+ for (i
nt i
= 0 ; i < n_dict_signals; ++i)
{
g_signal_handler_block (ds->dict,
ds->dict_handler_id[i]);
{
g_signal_handler_block (ds->dict,
ds->dict_handler_id[i]);
@@
-838,8
+840,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_msg (input, UTF8, fmt->type,
&value, width
,
- dict_get_encoding (dict->dict))
+ && data_in_msg (input, UTF8, fmt->type,
settings_get_fmt_settings ()
,
+
&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);