projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2672542
)
Got another test working
author
John Darrington
<john@darrington.wattle.id.au>
Thu, 28 Feb 2013 18:21:41 +0000
(19:21 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Thu, 28 Feb 2013 18:21:41 +0000
(19:21 +0100)
src/data/ods-reader.c
patch
|
blob
|
history
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index a5ece5c504b394bde637060d603771e8bf7d7145..158a2735aca501ac69cedd727d193e086e3d3749 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-637,7
+637,8
@@
ods_make_reader (struct spreadsheet *spreadsheet,
/* Advance to the start of the cells for the target sheet */
/* Advance to the start of the cells for the target sheet */
- while ( ! reading_target_sheet (r) || r->state != STATE_ROW || r->row < r->start_row )
+ while ( ! reading_target_sheet (r)
+ || r->state != STATE_ROW || r->row <= r->start_row )
{
if (1 != (ret = xmlTextReaderRead (r->xtr)))
break;
{
if (1 != (ret = xmlTextReaderRead (r->xtr)))
break;
@@
-696,6
+697,9
@@
ods_make_reader (struct spreadsheet *spreadsheet,
var_spec[idx].firstval.type = 0;
var_spec [idx].name = strdup (CHAR_CAST (const char *, value));
var_spec[idx].firstval.type = 0;
var_spec [idx].name = strdup (CHAR_CAST (const char *, value));
+
+ // printf ("%s:%d Name %s\n", __FILE__, __LINE__, var_spec [idx].name);
+
xmlFree (value);
}
}
xmlFree (value);
}
}
@@
-752,6
+756,8
@@
ods_make_reader (struct spreadsheet *spreadsheet,
var_spec [idx].firstval.text = xmlTextReaderValue (r->xtr);
var_spec [idx].firstval.value = val_string;
var_spec [idx].firstval.text = xmlTextReaderValue (r->xtr);
var_spec [idx].firstval.value = val_string;
+ // printf ("%s:%d Text %s\n", __FILE__, __LINE__, var_spec [idx].firstval.text);
+
val_string = NULL;
type = NULL;
}
val_string = NULL;
type = NULL;
}