Commit b50c9305 authored by Alexander.Trofimov's avatar Alexander.Trofimov

delete tryConvert

delete checkTypeCell
checkTypeCell2 -> checkTypeCell
parent 3a713b55
......@@ -62,7 +62,7 @@
var cArray = AscCommonExcel.cArray;
var cBaseFunction = AscCommonExcel.cBaseFunction;
var checkTypeCell2 = AscCommonExcel.checkTypeCell2;
var checkTypeCell = AscCommonExcel.checkTypeCell;
var cFormulaFunctionGroup = AscCommonExcel.cFormulaFunctionGroup;
var _func = AscCommonExcel._func;
......@@ -454,7 +454,7 @@
}
var v = arg1.getWS()._getCellNoEmpty(bb.r1 + numberRow, resC);
return this.value = checkTypeCell2(v);
return this.value = checkTypeCell(v);
};
cHLOOKUP.prototype.getInfo = function () {
return {
......@@ -540,7 +540,7 @@
}
} else if (cElementType.cell === arg0.type || cElementType.cell3D === arg0.type) {
if ((arg1 == 0 || arg1 == 1) && (arg2 == 0 || arg2 == 1)) {
res = arg0.tryConvert();
res = arg0.getValue();
}
} else {
res = new cError(cErrorType.wrong_value_type);
......@@ -701,7 +701,7 @@
return this.value = arg0;
}
if (cElementType.cell === arg0.type) {
arg0 = arg0.tryConvert();
arg0 = arg0.getValue();
}
function arrFinder(arr) {
......@@ -759,7 +759,7 @@
}
var c = new CellAddress(BBox.r1 + resR, BBox.c1 + resC);
return this.value = checkTypeCell2(_arg2.getWS()._getCellNoEmpty(c.getRow0(), c.getCol0()));
return this.value = checkTypeCell(_arg2.getWS()._getCellNoEmpty(c.getRow0(), c.getCol0()));
} else {
var arg1Range = arg1.getRange(), arg2Range = arg2.getRange();
......@@ -1424,7 +1424,7 @@
}
var v = arg1.getWS()._getCellNoEmpty(resR, bb.c1 + numberCol);
return this.value = checkTypeCell2(v);
return this.value = checkTypeCell(v);
};
cVLOOKUP.prototype.getInfo = function () {
return {
......
This diff is collapsed.
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