Skip to content

Commit 4254ed4

Browse files
fedelwaySheetJSDev
authored andcommitted
Fixed parsing for first cell in .fods documents
1 parent 6ecfeb6 commit 4254ed4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bits/80_parseods.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ var parse_content_xml = (function() {
219219
case 'scripts': // 3.12 <office:scripts>
220220
case 'styles': // TODO <office:styles>
221221
case 'font-face-decls': // 3.14 <office:font-face-decls>
222+
case 'master-styles': //3.15.4 <office:master-styles> -- relevant for FODS
222223
if(Rn[1]==='/'){if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp;}
223224
else if(Rn[0].charAt(Rn[0].length-2) !== '/') state.push([Rn[3], true]);
224225
break;
@@ -285,7 +286,6 @@ var parse_content_xml = (function() {
285286
case 'script': break; // 3.13 <office:script>
286287
case 'libraries': break; // TODO: <ooo:libraries>
287288
case 'automatic-styles': break; // 3.15.3 <office:automatic-styles>
288-
case 'master-styles': break; // TODO: <office:master-styles>
289289

290290
case 'default-style': // TODO: <style:default-style>
291291
case 'page-layout': break; // TODO: <style:page-layout>
@@ -382,6 +382,7 @@ var parse_content_xml = (function() {
382382
case 'line-break': break; // 6.1.5 <text:line-break>
383383
case 'span': break; // 6.1.7 <text:span>
384384
case 'p': case '文本串': // 5.1.3 <text:p>
385+
if(['master-styles'].indexOf(state[satte.length-1][0]) > -1) break;
385386
if(Rn[1]==='/' && (!ctag || !ctag['string-value'])) {
386387
var ptp = parse_text_p(str.slice(textpidx,Rn.index), textptag);
387388
textp = (textp.length > 0 ? textp + "\n" : "") + ptp[0];

0 commit comments

Comments
 (0)