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

fix bug 33735 :bug:

parent e28ead51
No related merge requests found
...@@ -845,7 +845,7 @@ ...@@ -845,7 +845,7 @@
var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2] ? arg[2] : new cNumber(1); var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2] ? arg[2] : new cNumber(1);
function findMatch(a0, a1, a2) { function findMatch(a0, a1, a2) {
var a1RowCount = a1.length, a1ColumnCount = a1[0].length, a0Value = a0.getValue(), a2Value = a2.getValue(), arr = [], res = new cError(cErrorType.not_available), index = -1; var i, a1RowCount = a1.length, a1ColumnCount = a1[0].length, a0Value = a0.getValue(), a2Value = a2.getValue(), arr = [], res = new cError(cErrorType.not_available), index = -1;
if (a1RowCount > 1 && a1ColumnCount > 1) { if (a1RowCount > 1 && a1ColumnCount > 1) {
return new cError(cErrorType.not_available); return new cError(cErrorType.not_available);
...@@ -866,7 +866,7 @@ ...@@ -866,7 +866,7 @@
} }
if (a2Value == -1) { if (a2Value == -1) {
for (var i = 0; i < arr.length; i++) { for (i = 0; i < arr.length; i++) {
if (arr[i] >= a0Value) { if (arr[i] >= a0Value) {
index = i; index = i;
} else { } else {
...@@ -875,14 +875,14 @@ ...@@ -875,14 +875,14 @@
} }
} else if (a2Value == 0) { } else if (a2Value == 0) {
if (cElementType.string === a0.type) { if (cElementType.string === a0.type) {
for (var i = 0; i < arr.length; i++) { for (i = 0; i < arr.length; i++) {
if (AscCommonExcel.searchRegExp2(arr[i].toString(), a0Value)) { if (AscCommonExcel.searchRegExp2(arr[i].toString(), a0Value)) {
index = i; index = i;
break; break;
} }
} }
} else { } else {
for (var i = 0; i < arr.length; i++) { for (i = 0; i < arr.length; i++) {
if (arr[i] == a0Value) { if (arr[i] == a0Value) {
index = i; index = i;
break; break;
...@@ -890,10 +890,9 @@ ...@@ -890,10 +890,9 @@
} }
} }
} else if (a2Value == 1) { } else if (a2Value == 1) {
for (var i = 0; i < arr.length; i++) { for (i = 0; i < arr.length; i++) {
if (arr[i] <= a0Value) { if (arr[i] <= a0Value) {
index = i; index = i;
} else {
break; break;
} }
} }
......
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