projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
data
/
ods-reader.c
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index b2efe2c5734c5c8a07dda87e39f4f8b69b75b15f..c95272364580179316c34c076ec43a4e5c90cc60 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-129,7
+129,7
@@
struct cache_datum
{
struct hmap_node node;
{
struct hmap_node node;
- /* The
the
number of the sheet. */
+ /* The number of the sheet. */
int sheet;
/* The cell's row. */
int sheet;
/* The cell's row. */
@@
-661,8
+661,8
@@
convert_xml_to_value (struct ccase *c, const struct variable *var,
value_copy_str_rpad (v, var_get_width (var), xmv->text, ' ');
else
{
value_copy_str_rpad (v, var_get_width (var), xmv->text, ' ');
else
{
- const struct fmt_spec
*
fmt = var_get_write_format (var);
- enum fmt_category fc = fmt_get_category (fmt
->
type);
+ const struct fmt_spec fmt = var_get_write_format (var);
+ enum fmt_category fc = fmt_get_category (fmt
.
type);
assert (fc != FMT_CAT_STRING);
assert (fc != FMT_CAT_STRING);
@@
-675,7
+675,7
@@
convert_xml_to_value (struct ccase *c, const struct variable *var,
const char *text = xmv->value ?
CHAR_CAST (const char *, xmv->value) : CHAR_CAST (const char *, xmv->text);
const char *text = xmv->value ?
CHAR_CAST (const char *, xmv->value) : CHAR_CAST (const char *, xmv->text);
- char *m = data_in (ss_cstr (text), "UTF-8", fmt
->
type,
+ char *m = data_in (ss_cstr (text), "UTF-8", fmt
.
type,
settings_get_fmt_settings (), v,
var_get_width (var), "UTF-8");
settings_get_fmt_settings (), v,
var_get_width (var), "UTF-8");
@@
-954,7
+954,7
@@
ods_make_reader (struct spreadsheet *spreadsheet,
else
fmt = fmt_default_for_width (width);
else
fmt = fmt_default_for_width (width);
- var_set_both_formats (var,
&
fmt);
+ var_set_both_formats (var, fmt);
}
if (n_var_specs == 0)
}
if (n_var_specs == 0)