X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftext-data-import-dialog.c;h=6f33ff6d8bb8b6547a76a91bc06d35260a3a1881;hb=ff59ee87992b440aab8083ee041f9aecd2ce68ca;hp=8eebf9775677954e17f0a19f73ca9a8273a16e45;hpb=f15c854d8500105766b2f5666bb62b983ff24f88;p=pspp-builds.git diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index 8eebf977..6f33ff6d 100644 --- a/src/ui/gui/text-data-import-dialog.c +++ b/src/ui/gui/text-data-import-dialog.c @@ -1543,6 +1543,7 @@ init_formats_page (struct import_assistant *ia) p->data_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "data")); p->modified_vars = NULL; p->modified_var_cnt = 0; + p->dict = NULL; } /* Frees IA's formats substructure. */ @@ -1748,7 +1749,9 @@ parse_field (struct import_assistant *ia, if (field.string != NULL) { msg_disable (); + if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0, + ia->formats.dict, &val, var_get_width (var))) { char fmt_string[FMT_STRING_LEN_MAX + 1]; @@ -1768,7 +1771,7 @@ parse_field (struct import_assistant *ia, } if (outputp != NULL) { - *outputp = data_out (&val, &out); + *outputp = data_out (&val, dict_get_encoding (ia->formats.dict), &out); } value_destroy (&val, var_get_width (var));