projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Improve title display in overview pane of GUI output.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-var-store.c
diff --git
a/src/ui/gui/psppire-var-store.c
b/src/ui/gui/psppire-var-store.c
index 092de58cafa0ed89f827d61a617c9008a442e86a..aadc585548582fc79629dca6b580e271ad6c7cde 100644
(file)
--- a/
src/ui/gui/psppire-var-store.c
+++ b/
src/ui/gui/psppire-var-store.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006 Free Software Foundation
+ Copyright (C) 2006
, 2009
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
@@
-484,10
+484,19
@@
psppire_var_store_set_string (PsppireSheetModel *model,
break;
case PSPPIRE_VAR_STORE_COL_WIDTH:
{
break;
case PSPPIRE_VAR_STORE_COL_WIDTH:
{
- int width = atoi (text);
- if ( ! text) return FALSE;
+ const int width = atoi (text);
+ if ( ! text)
+ return FALSE;
+
+ if (width < 0)
+ return FALSE;
+
if ( var_is_alpha (pv))
if ( var_is_alpha (pv))
+ {
+ if ( width > MAX_STRING )
+ return FALSE;
var_set_width (pv, width);
var_set_width (pv, width);
+ }
else
{
bool for_input
else
{
bool for_input
@@
-688,20
+697,20
@@
text_for_column (PsppireVarStore *vs,
gchar *ss;
GString *gstr = g_string_sized_new (10);
const struct val_labs *vls = var_get_value_labels (pv);
gchar *ss;
GString *gstr = g_string_sized_new (10);
const struct val_labs *vls = var_get_value_labels (pv);
- struct val_labs_iterator *ip = 0;
- struct val_lab *vl = val_labs_first_sorted (vls, &ip);
+ const struct val_lab **labels = val_labs_sorted (vls);
+ const struct val_lab *vl = labels[0];
+ free (labels);
g_assert (vl);
{
gchar *const vstr = value_to_text (vl->value, *write_spec);
g_assert (vl);
{
gchar *const vstr = value_to_text (vl->value, *write_spec);
- g_string_printf (gstr, "{%s,\"%s\"}_", vstr, vl->label);
+ g_string_printf (gstr, "{%s,\"%s\"}_",
+ vstr, val_lab_get_label (vl));
g_free (vstr);
}
g_free (vstr);
}
- val_labs_done (&ip);
-
ss = recode_string (UTF8, psppire_dict_encoding (dict),
gstr->str, gstr->len);
g_string_free (gstr, TRUE);
ss = recode_string (UTF8, psppire_dict_encoding (dict),
gstr->str, gstr->len);
g_string_free (gstr, TRUE);