Commit 30e43997 authored by Alexander.Trofimov's avatar Alexander.Trofimov

getBBox -> getBBox0

parent 125d4a36
......@@ -822,19 +822,18 @@
return this.value = new cError(cErrorType.bad_reference);
}
var b = arg2.getBBox0();
if (this.argumentsCurrent == 2) {
var b = arg2.getBBox();
if (arg1Range[0].length >= 2) {
return this.value = new cRef(ws.getCell3((b.r1 - 1) + index, (b.c2 - 1) + 0).getName(), ws);
return this.value = new cRef(ws.getCell3(b.r1 + index, b.c2 + 0).getName(), ws);
} else {
return this.value = new cRef(ws.getCell3((b.r1 - 1) + 0, (b.c1 - 1) + index).getName(), ws);
return this.value = new cRef(ws.getCell3(b.r1 + 0, b.c1 + index).getName(), ws);
}
} else {
var b = arg2.getBBox();
if (arg2Range.length == 1) {
return this.value = new cRef(ws.getCell3((b.r1 - 1) + 0, (b.c1 - 1) + index).getName(), ws);
return this.value = new cRef(ws.getCell3(b.r1 + 0, b.c1 + index).getName(), ws);
} else {
return this.value = new cRef(ws.getCell3((b.r1 - 1) + index, (b.c1 - 1) + 0).getName(), ws);
return this.value = new cRef(ws.getCell3(b.r1 + index, b.c1 + 0).getName(), ws);
}
}
}
......@@ -1167,14 +1166,14 @@
} else if (cElementType.cellsRange === arg0.type || cElementType.cell === arg0.type ||
cElementType.cell3D === arg0.type) {
var range = arg0.getRange();
return this.value = new cNumber(Math.abs(range.getBBox().r1 - range.getBBox().r2) + 1);
return this.value = new cNumber(Math.abs(range.getBBox0().r1 - range.getBBox0().r2) + 1);
} else if (cElementType.cellsRange3D === arg0.type) {
var range = arg0.getRange();
if (range.length > 1) {
return this.value = new cError(cErrorType.wrong_value_type);
}
return this.value = new cNumber(Math.abs(range[0].getBBox().r1 - range[0].getBBox().r2) + 1);
return this.value = new cNumber(Math.abs(range[0].getBBox0().r1 - range[0].getBBox0().r2) + 1);
} else {
return this.value = new cError(cErrorType.wrong_value_type);
}
......
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