diff --git a/bits/85_parsezip.js b/bits/85_parsezip.js index e9dc519..8b1aa01 100644 --- a/bits/85_parsezip.js +++ b/bits/85_parsezip.js @@ -135,7 +135,7 @@ function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ { out.files = zip.files; } if(opts.bookVBA) { - if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0],true); + if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0].replace(/^\//,''),true); else if(dir.defaults && dir.defaults.bin === 'application/vnd.ms-office.vbaProject') out.vbaraw = getzipdata(zip,'xl/vbaProject.bin',true); } return out; diff --git a/test.js b/test.js index 0f96d77..677b17b 100644 --- a/test.js +++ b/test.js @@ -434,9 +434,9 @@ describe('parse options', function() { }); it('bookVBA should generate vbaraw (XLSX/XLSB)', function() { var wb = X.readFile(paths.nfxlsx,{bookVBA:true}); - assert(typeof wb.vbaraw !== 'undefined'); + assert(wb.vbaraw); wb = X.readFile(paths.nfxlsb,{bookVBA:true}); - assert(typeof wb.vbaraw !== 'undefined'); + assert(wb.vbaraw); }); }); }); diff --git a/xlsx.flow.js b/xlsx.flow.js index b554074..5a1bd36 100644 --- a/xlsx.flow.js +++ b/xlsx.flow.js @@ -13280,7 +13280,7 @@ function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ { out.files = zip.files; } if(opts.bookVBA) { - if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0],true); + if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0].replace(/^\//,''),true); else if(dir.defaults && dir.defaults.bin === 'application/vnd.ms-office.vbaProject') out.vbaraw = getzipdata(zip,'xl/vbaProject.bin',true); } return out; diff --git a/xlsx.js b/xlsx.js index ae74ac6..b82edba 100644 --- a/xlsx.js +++ b/xlsx.js @@ -13223,7 +13223,7 @@ function parse_zip(zip, opts) { out.files = zip.files; } if(opts.bookVBA) { - if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0],true); + if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0].replace(/^\//,''),true); else if(dir.defaults && dir.defaults.bin === 'application/vnd.ms-office.vbaProject') out.vbaraw = getzipdata(zip,'xl/vbaProject.bin',true); } return out;