Commit 5f1d11fc authored by Alexander.Trofimov's avatar Alexander.Trofimov

delete usage getCells in INDEX function

parent 0d4c6744
...@@ -491,28 +491,24 @@ ...@@ -491,28 +491,24 @@
} else if (cElementType.cellsRange === arg0.type) { } else if (cElementType.cellsRange === arg0.type) {
var ws = arg0.getWS(), bbox = arg0.getBBox0(); var ws = arg0.getWS(), bbox = arg0.getBBox0();
if (bbox.r1 == bbox.r2) {/*одна строка*/ if (bbox.r1 === bbox.r2) {/*одна строка*/
res = ws.getRange3(bbox.r1, bbox.c1 + arg1 - 1, bbox.r1, bbox.c1 + arg1 - 1).getCells()[0].getName(); res = new Asc.Range(bbox.c1 + arg1 - 1, bbox.r1, bbox.c1 + arg1 - 1, bbox.r1);
res = new cRef(res, ws); res = new cRef(res.getName(), ws);
} else { } else {
if (arg1 == 0 && arg2 > 0) { if (0 === arg1 && arg2 > 0) {
var _a1 = ws.getRange3(bbox.r1, bbox.c1 + arg2 - 1, bbox.r1, bbox.c2 + arg2 - 1) res = new Asc.Range(bbox.c1 + arg2 - 1, bbox.r1, bbox.c1 + arg2 - 1, bbox.r2);
.getCells()[0].getName(), _a2 = ws.getRange3(bbox.r2, bbox.c1 + arg2 - 1, bbox.r2, res = new cArea(res.getName(), ws);
bbox.c2 + arg2 - 1)
.getCells()[0].getName();
res = new cArea(_a1.toString() + ":" + _a2.toString(), ws);
} else { } else {
if (arg1 > Math.abs(bbox.r1 - bbox.r2) + 1 || arg2 > Math.abs(bbox.c1 - bbox.c2) + 1) { if (arg1 > Math.abs(bbox.r1 - bbox.r2) + 1 || arg2 > Math.abs(bbox.c1 - bbox.c2) + 1) {
res = new cError(cErrorType.bad_reference); res = new cError(cErrorType.bad_reference);
} else { } else {
res = new cRef(ws.getRange3(bbox.r1 + arg1 - 1, bbox.c1 + arg2 - 1, bbox.r1 + arg1 - 1, res = new Asc.Range(bbox.c1 + arg2 - 1, bbox.r1 + arg1 - 1, bbox.c1 + arg2 - 1, bbox.r1 + arg1 - 1)
bbox.c1 + arg2 - 1) res = new cRef(res.getName(), ws);
.getCells()[0].getName(), ws);
} }
} }
} }
} else if (cElementType.cell === arg0.type || cElementType.cell3D === arg0.type) { } else if (cElementType.cell === arg0.type || cElementType.cell3D === arg0.type) {
if ((arg1 == 0 || arg1 == 1) && (arg2 == 0 || arg2 == 1)) { if ((0 === arg1 || 1 === arg1) && (0 === arg2 || 1 === arg2)) {
res = arg0.getValue(); res = arg0.getValue();
} }
} else { } else {
......
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