X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=2fabf4d5d423466179a4bc6d9c39cb2f33302c46;hb=refs%2Fbuilds%2F20120213030503%2Fpspp;hp=7d26f5629b67b3c0bb0da77f09f5963027c9e7e6;hpb=38993354cabb6fc37bb882be92f9a49e9aeb4c88;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 7d26f5629b..2fabf4d5d4 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -621,7 +621,7 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) } } - fp = var_get_write_format (pv); + fp = var_get_print_format (pv); text = data_out (&v, dict_get_encoding (dict), fp); @@ -679,7 +679,7 @@ psppire_data_store_set_string (PsppireDataStore *store, psppire_data_store_data_in (store, row, var_get_case_index (pv), ss_cstr (text), - var_get_write_format (pv)); + var_get_print_format (pv)); psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, 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); - case_ref (cc); + cc = case_ref (cc); result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); if ( result ) @@ -959,8 +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) - && data_in (input, UTF8, fmt->type, 0, 0, &value, width, - dict_get_encoding (dict->dict)) + && 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);