diff --git a/xlsx.js b/xlsx.js index 615b721..c1aa8a7 100644 --- a/xlsx.js +++ b/xlsx.js @@ -111,8 +111,8 @@ function parseSheet(data) { //TODO: use a real xml parser var cells = x.substr(x.indexOf('>')+1).split(/ idx) refguess.s.c = idx; - if(refguess.e.c < idx) refguess.e.c = idx; + if(refguess.s.c > idx - 1) refguess.s.c = idx - 1; + if(refguess.e.c < idx - 1) refguess.e.c = idx - 1; var cell = parsexmltag((c.match(/]*>/)||[c])[0]); delete cell[0]; var d = c.substr(c.indexOf('>')+1); var p = {}; @@ -191,7 +191,7 @@ function parseProps(data) { switch(v[i].v) { case "Worksheets": widx = j; p["Worksheets"] = +v[++i]; break; case "Named Ranges": ++i; break; // TODO: Handle Named Ranges - default: throw "Unrecognized key in Heading Pairs: " + v[i].v; + default: console.error("Unrecognized key in Heading Pairs: " + v[i++].v); } } var parts = parseVector(q["TitlesOfParts"]);