Commit 0f1a102a authored by GoshaZotov's avatar GoshaZotov

fix bug 35738

parent 68053a87
...@@ -623,9 +623,14 @@ ...@@ -623,9 +623,14 @@
}else if(cElementType.cellsRange === arg0.type || cElementType.cell === arg0.type || cElementType.cell3D === arg0.type){ }else if(cElementType.cellsRange === arg0.type || cElementType.cell === arg0.type || cElementType.cell3D === arg0.type){
res = new cNumber(1); res = new cNumber(1);
}else if(cElementType.cellsRange3D === arg0.type){ }else if(cElementType.cellsRange3D === arg0.type){
var sheet1 = arg0.wsFrom.index; var sheet1 = arg0.wsFrom.nSheetId;
var sheet2 = arg0.wsTo.index; var sheet2 = arg0.wsTo.nSheetId;
res = new cNumber(Math.abs(sheet2 - sheet1) + 1); if(sheet1 === sheet2){
res = new cNumber(1);
}else{
res = new cNumber(Math.abs(sheet2 - sheet1));
}
}else{ }else{
res = new cError(cErrorType.not_available); res = new cError(cErrorType.not_available);
} }
......
...@@ -5229,7 +5229,7 @@ parserFormula.prototype.parse = function(local, digitDelim) { ...@@ -5229,7 +5229,7 @@ parserFormula.prototype.parse = function(local, digitDelim) {
} }
} else if (cElementType.cellsRange3D === currentElement.type) { } else if (cElementType.cellsRange3D === currentElement.type) {
bbox = currentElement.getBBox0(); bbox = currentElement.getBBox0();
if (!bbox.isAbsAll()) { if (bbox && !bbox.isAbsAll()) {
cloneElem = currentElement.clone(); cloneElem = currentElement.clone();
bbox = cloneElem.getBBox0(); bbox = cloneElem.getBBox0();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment