projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp-sheet-view-column: Be consistent about use of !! for booleans.
[pspp]
/
src
/
data
/
ods-reader.c
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index aedea078dfc34d82242a3783aeaef8e86e03b76a..170c005739b9eed6070465743d20ac4de521bab9 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011
, 2012
Free Software Foundation, Inc.
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
@@
-324,11
+324,11
@@
convert_xml_to_value (struct ccase *c, const struct variable *var,
text =
xmv->value ? CHAR_CAST (const char *, xmv->value) : CHAR_CAST (const char *, xmv->text);
text =
xmv->value ? CHAR_CAST (const char *, xmv->value) : CHAR_CAST (const char *, xmv->text);
- data_in (ss_cstr (text), "UTF-8",
- fmt->type,
- v,
- var_get_width (var),
-
"UTF-8"
);
+
free (
data_in (ss_cstr (text), "UTF-8",
+
fmt->type,
+
v,
+
var_get_width (var),
+
"UTF-8")
);
}
}
}
}
@@
-592,6
+592,10
@@
ods_open_reader (struct spreadsheet_read_info *gri, struct dictionary **dict)
free (var_spec);
free (var_spec);
+ dict_destroy (r->dict);
+ ods_file_casereader_destroy (NULL, r);
+
+
return NULL;
}
return NULL;
}