Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add simple merge cells capability #37

Closed
wants to merge 4 commits into from
Closed

Add simple merge cells capability #37

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd81dd7
Add simple merge cells capability for hack
mchapman Mar 8, 2014
af14468
Save as range structures
mchapman Mar 13, 2014
3c5e5d1
Add simple merge cells capability for hack and save as range structures
mchapman Mar 8, 2014
386349d
Merge branch 'master' of github.com:mchapman/js-xls
mchapman Mar 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions xls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,7 +1949,14 @@ var parse_BookBool = parsenoop;
var parse_DbOrParamQry = parsenoop;
var parse_OleObjectSize = parsenoop;
var parse_SXVS = parsenoop;
var parse_MergeCells = parsenoop;
function parse_MergeCells(blob, length) {
var merges = [];
var cmcs = blob.read_shift(2);
while (cmcs--) {
merges.push(parse_Ref8U(blob,length));
}
return merges;
}
var parse_BkHim = parsenoop;
var parse_MsoDrawingGroup = parsenoop;
var parse_MsoDrawing = parsenoop;
Expand Down Expand Up @@ -4822,6 +4829,7 @@ function parse_workbook(blob, options) {
out["!ref"] = encode_range(range);
range.e.r++; range.e.c++;
}
out["!mergeCells"] = wb.opts.mergeCells;
}
for(y in out) if(out.hasOwnProperty(y)) nout[y] = out[y];
if(cur_sheet === "") Preamble = nout; else Sheets[cur_sheet] = nout;
Expand Down Expand Up @@ -4958,9 +4966,9 @@ function parse_workbook(blob, options) {

} break;

case 'MergeCells': break;
case 'MergeCells': wb.opts.mergeCells = val; break;

case 'WOpt': break; // TODO: WTF?
case 'WOpt': break; // TODO: WTF?
case 'HLink': case 'HLinkTooltip': break;

case 'PhoneticInfo': break;
Expand Down