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

fix bug 34289

parent c28883f1
This diff is collapsed.
......@@ -45,7 +45,10 @@
cFormulaFunctionGroup['Cube'].push(cCUBEKPIMEMBER, cCUBEMEMBER, cCUBEMEMBERPROPERTY, cCUBERANKEDMEMBER, cCUBESET,
cCUBESETCOUNT, cCUBEVALUE);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEKPIMEMBER() {
this.name = "CUBEKPIMEMBER";
this.value = null;
......@@ -57,7 +60,10 @@
cCUBEKPIMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBEKPIMEMBER.prototype.constructor = cCUBEKPIMEMBER;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEMEMBER() {
this.name = "CUBEMEMBER";
this.value = null;
......@@ -69,7 +75,10 @@
cCUBEMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBEMEMBER.prototype.constructor = cCUBEMEMBER;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEMEMBERPROPERTY() {
this.name = "CUBEMEMBERPROPERTY";
this.value = null;
......@@ -81,7 +90,10 @@
cCUBEMEMBERPROPERTY.prototype = Object.create(cBaseFunction.prototype);
cCUBEMEMBERPROPERTY.prototype.constructor = cCUBEMEMBERPROPERTY;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBERANKEDMEMBER() {
this.name = "CUBERANKEDMEMBER";
this.value = null;
......@@ -93,7 +105,10 @@
cCUBERANKEDMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBERANKEDMEMBER.prototype.constructor = cCUBERANKEDMEMBER;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBESET() {
this.name = "CUBESET";
this.value = null;
......@@ -105,7 +120,10 @@
cCUBESET.prototype = Object.create(cBaseFunction.prototype);
cCUBESET.prototype.constructor = cCUBESET;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBESETCOUNT() {
this.name = "CUBESETCOUNT";
this.value = null;
......@@ -117,7 +135,10 @@
cCUBESETCOUNT.prototype = Object.create(cBaseFunction.prototype);
cCUBESETCOUNT.prototype.constructor = cCUBESETCOUNT;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEVALUE() {
this.name = "CUBEVALUE";
this.value = null;
......
......@@ -44,7 +44,10 @@
cFormulaFunctionGroup['Database'].push(cDAVERAGE, cDCOUNT, cDCOUNTA, cDGET, cDMAX, cDMIN, cDPRODUCT, cDSTDEV,
cDSTDEVP, cDSUM, cDVAR, cDVARP);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDAVERAGE() {
cBaseFunction.call(this, "DAVERAGE");
}
......@@ -52,7 +55,10 @@
cDAVERAGE.prototype = Object.create(cBaseFunction.prototype);
cDAVERAGE.prototype.constructor = cDAVERAGE;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDCOUNT() {
cBaseFunction.call(this, "DCOUNT");
}
......@@ -60,7 +66,10 @@
cDCOUNT.prototype = Object.create(cBaseFunction.prototype);
cDCOUNT.prototype.constructor = cDCOUNT;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDCOUNTA() {
cBaseFunction.call(this, "DCOUNTA");
}
......@@ -68,7 +77,10 @@
cDCOUNTA.prototype = Object.create(cBaseFunction.prototype);
cDCOUNTA.prototype.constructor = cDCOUNTA;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDGET() {
cBaseFunction.call(this, "DGET");
}
......@@ -76,7 +88,10 @@
cDGET.prototype = Object.create(cBaseFunction.prototype);
cDGET.prototype.constructor = cDGET;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDMAX() {
cBaseFunction.call(this, "DMAX");
}
......@@ -84,7 +99,10 @@
cDMAX.prototype = Object.create(cBaseFunction.prototype);
cDMAX.prototype.constructor = cDMAX;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDMIN() {
cBaseFunction.call(this, "DMIN");
}
......@@ -92,7 +110,10 @@
cDMIN.prototype = Object.create(cBaseFunction.prototype);
cDMIN.prototype.constructor = cDMIN;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDPRODUCT() {
cBaseFunction.call(this, "DPRODUCT");
}
......@@ -100,7 +121,10 @@
cDPRODUCT.prototype = Object.create(cBaseFunction.prototype);
cDPRODUCT.prototype.constructor = cDPRODUCT;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSTDEV() {
cBaseFunction.call(this, "DSTDEV");
}
......@@ -108,7 +132,10 @@
cDSTDEV.prototype = Object.create(cBaseFunction.prototype);
cDSTDEV.prototype.constructor = cDSTDEV;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSTDEVP() {
cBaseFunction.call(this, "DSTDEVP");
}
......@@ -116,7 +143,10 @@
cDSTDEVP.prototype = Object.create(cBaseFunction.prototype);
cDSTDEVP.prototype.constructor = cDSTDEVP;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSUM() {
cBaseFunction.call(this, "DSUM");
}
......@@ -124,7 +154,10 @@
cDSUM.prototype = Object.create(cBaseFunction.prototype);
cDSUM.prototype.constructor = cDSUM;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDVAR() {
cBaseFunction.call(this, "DVAR");
}
......@@ -132,7 +165,10 @@
cDVAR.prototype = Object.create(cBaseFunction.prototype);
cDVAR.prototype.constructor = cDVAR;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDVARP() {
cBaseFunction.call(this, "DVARP");
}
......
......@@ -294,7 +294,10 @@
cMINUTE, cMONTH, cNETWORKDAYS, cNETWORKDAYS_INTL, cNOW, cSECOND, cTIME, cTIMEVALUE, cTODAY, cWEEKDAY, cWEEKNUM,
cWORKDAY, cWORKDAY_INTL, cYEAR, cYEARFRAC);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDATE() {
this.name = "DATE";
this.value = null;
......@@ -364,7 +367,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDATEDIF() {
this.name = "DATEDIF";
this.value = null;
......@@ -482,7 +488,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDATEVALUE() {
this.name = "DATEVALUE";
this.value = null;
......@@ -522,7 +531,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDAY() {
this.name = "DAY";
this.value = null;
......@@ -595,7 +607,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDAYS360() {
this.name = "DAYS360";
this.value = null;
......@@ -661,7 +676,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cEDATE() {
this.name = "EDATE";
this.value = null;
......@@ -736,7 +754,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cEOMONTH() {
this.name = "EOMONTH";
this.value = null;
......@@ -802,7 +823,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHOUR() {
this.name = "HOUR";
this.value = null;
......@@ -867,7 +891,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cMINUTE() {
this.name = "MINUTE";
this.value = null;
......@@ -931,7 +958,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cMONTH() {
this.name = "MONTH";
this.value = null;
......@@ -1000,7 +1030,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNETWORKDAYS() {
this.name = "NETWORKDAYS";
this.value = null;
......@@ -1126,7 +1159,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNETWORKDAYS_INTL() {
cBaseFunction.call(this, "NETWORKDAYS.INTL");
}
......@@ -1134,7 +1170,10 @@
cNETWORKDAYS_INTL.prototype = Object.create(cBaseFunction.prototype);
cNETWORKDAYS_INTL.prototype.constructor = cNETWORKDAYS_INTL;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNOW() {
this.name = "NOW";
this.value = null;
......@@ -1158,7 +1197,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cSECOND() {
this.name = "SECOND";
this.value = null;
......@@ -1222,7 +1264,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTIME() {
this.name = "TIME";
this.value = null;
......@@ -1283,7 +1328,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTIMEVALUE() {
this.name = "TIMEVALUE";
this.value = null;
......@@ -1324,7 +1372,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTODAY() {
this.name = "TODAY";
this.value = null;
......@@ -1348,7 +1399,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cWEEKDAY() {
this.name = "WEEKDAY";
this.value = null;
......@@ -1431,7 +1485,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cWEEKNUM() {
this.name = "WEEKNUM";
this.value = null;
......@@ -1547,7 +1604,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cWORKDAY() {
this.name = "WORKDAY";
this.value = null;
......@@ -1674,7 +1734,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cWORKDAY_INTL() {
cBaseFunction.call(this, "WORKDAY.INTL");
}
......@@ -1682,7 +1745,10 @@
cWORKDAY_INTL.prototype = Object.create(cBaseFunction.prototype);
cWORKDAY_INTL.prototype.constructor = cWORKDAY_INTL;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cYEAR() {
this.name = "YEAR";
this.value = null;
......@@ -1745,7 +1811,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cYEARFRAC() {
this.name = "YEARFRAC";
this.value = null;
......
......@@ -876,7 +876,10 @@
cIMABS, cIMAGINARY, cIMARGUMENT, cIMCONJUGATE, cIMCOS, cIMDIV, cIMEXP, cIMLN, cIMLOG10, cIMLOG2, cIMPOWER,
cIMPRODUCT, cIMREAL, cIMSIN, cIMSQRT, cIMSUB, cIMSUM, cOCT2BIN, cOCT2DEC, cOCT2HEX);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBESSELI() {
cBaseFunction.call(this, "BESSELI", 2, 2);
}
......@@ -928,7 +931,10 @@
};
};*/
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBESSELJ() {
cBaseFunction.call(this, "BESSELJ");
}
......@@ -936,7 +942,10 @@
cBESSELJ.prototype = Object.create(cBaseFunction.prototype);
cBESSELJ.prototype.constructor = cBESSELJ;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBESSELK() {
cBaseFunction.call(this, "BESSELK");
}
......@@ -944,7 +953,10 @@
cBESSELK.prototype = Object.create(cBaseFunction.prototype);
cBESSELK.prototype.constructor = cBESSELK;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBESSELY() {
cBaseFunction.call(this, "BESSELY");
}
......@@ -952,7 +964,10 @@
cBESSELY.prototype = Object.create(cBaseFunction.prototype);
cBESSELY.prototype.constructor = cBESSELY;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBIN2DEC() {
cBaseFunction.call(this, "BIN2DEC", 1, 1);
}
......@@ -1000,7 +1015,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBIN2HEX() {
cBaseFunction.call(this, "BIN2HEX", 1, 2);
}
......@@ -1064,7 +1082,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBIN2OCT() {
cBaseFunction.call(this, "BIN2OCT", 1, 2);
}
......@@ -1128,7 +1149,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCOMPLEX() {
cBaseFunction.call(this, "COMPLEX", 2, 3);
}
......@@ -1192,7 +1216,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCONVERT() {
cBaseFunction.call(this, "CONVERT");
}
......@@ -1200,7 +1227,10 @@
cCONVERT.prototype = Object.create(cBaseFunction.prototype);
cCONVERT.prototype.constructor = cCONVERT;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDEC2BIN() {
cBaseFunction.call(this, "DEC2BIN", 1, 2);
}
......@@ -1259,7 +1289,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDEC2HEX() {
cBaseFunction.call(this, "DEC2HEX", 1, 2);
}
......@@ -1317,7 +1350,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDEC2OCT() {
cBaseFunction.call(this, "DEC2OCT", 1, 2);
}
......@@ -1375,7 +1411,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDELTA() {
cBaseFunction.call(this, "DELTA", 1, 2);
}
......@@ -1422,7 +1461,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cERF() {
cBaseFunction.call(this, "ERF", 1, 2);
}
......@@ -1474,7 +1516,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cERFC() {
cBaseFunction.call(this, "ERFC", 1, 1);
}
......@@ -1508,7 +1553,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cGESTEP() {
cBaseFunction.call(this, "GESTEP", 1, 2);
}
......@@ -1555,7 +1603,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHEX2BIN() {
cBaseFunction.call(this, "HEX2BIN", 1, 2);
}
......@@ -1626,7 +1677,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHEX2DEC() {
cBaseFunction.call(this, "HEX2DEC", 1, 1);
}
......@@ -1673,7 +1727,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHEX2OCT() {
cBaseFunction.call(this, "HEX2OCT", 1, 2);
}
......@@ -1743,7 +1800,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMABS() {
cBaseFunction.call(this, "IMABS", 1, 1);
}
......@@ -1783,7 +1843,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMAGINARY() {
cBaseFunction.call(this, "IMAGINARY", 1, 1);
}
......@@ -1823,7 +1886,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMARGUMENT() {
cBaseFunction.call(this, "IMARGUMENT", 1, 1);
}
......@@ -1863,7 +1929,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMCONJUGATE() {
cBaseFunction.call(this, "IMCONJUGATE", 1, 1);
}
......@@ -1903,7 +1972,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMCOS() {
cBaseFunction.call(this, "IMCOS", 1, 1);
}
......@@ -1945,7 +2017,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMDIV() {
cBaseFunction.call(this, "IMDIV", 2, 2);
}
......@@ -1998,7 +2073,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMEXP() {
cBaseFunction.call(this, "IMEXP", 1, 1);
}
......@@ -2040,7 +2118,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMLN() {
cBaseFunction.call(this, "IMLN", 1, 1);
}
......@@ -2086,7 +2167,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMLOG10() {
cBaseFunction.call(this, "IMLOG10", 1, 1);
}
......@@ -2132,7 +2216,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMLOG2() {
cBaseFunction.call(this, "IMLOG2", 1, 1);
}
......@@ -2178,7 +2265,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMPOWER() {
cBaseFunction.call(this, "IMPOWER", 2, 2);
}
......@@ -2234,7 +2324,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMPRODUCT() {
cBaseFunction.call(this, "IMPRODUCT", 1);
}
......@@ -2332,7 +2425,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMREAL() {
cBaseFunction.call(this, "IMREAL", 1, 1);
}
......@@ -2372,7 +2468,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMSIN() {
cBaseFunction.call(this, "IMSIN", 1, 1);
}
......@@ -2414,7 +2513,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMSQRT() {
cBaseFunction.call(this, "IMSQRT", 1, 1);
}
......@@ -2456,7 +2558,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMSUB() {
cBaseFunction.call(this, "IMSUB", 2, 2);
}
......@@ -2509,7 +2614,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIMSUM() {
cBaseFunction.call(this, "IMSUM", 1);
}
......@@ -2608,7 +2716,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOCT2BIN() {
cBaseFunction.call(this, "OCT2BIN", 1, 2);
}
......@@ -2679,7 +2790,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOCT2DEC() {
cBaseFunction.call(this, "OCT2DEC", 1, 1);
}
......@@ -2726,7 +2840,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOCT2HEX() {
cBaseFunction.call(this, "OCT2HEX", 1, 2);
}
......
......@@ -55,7 +55,10 @@
cFormulaFunctionGroup['Information'].push(cERROR_TYPE, cISBLANK, cISERR, cISERROR, cISEVEN, cISLOGICAL, cISNA,
cISNONTEXT, cISNUMBER, cISODD, cISREF, cISTEXT, cN, cNA, cTYPE);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cERROR_TYPE() {
this.name = "ERROR.TYPE";
this.value = null;
......@@ -117,7 +120,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISBLANK() {
this.name = "ISBLANK";
this.value = null;
......@@ -147,7 +153,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISERR() {
this.name = "ISERR";
this.value = null;
......@@ -180,7 +189,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISERROR() {
this.name = "ISERROR";
this.value = null;
......@@ -213,7 +225,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISEVEN() {
this.name = "ISEVEN";
this.value = null;
......@@ -251,7 +266,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISLOGICAL() {
this.name = "ISLOGICAL";
this.value = null;
......@@ -284,7 +302,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNA() {
this.name = "ISNA";
this.value = null;
......@@ -317,7 +338,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNONTEXT() {
this.name = "ISNONTEXT";
this.value = null;
......@@ -349,7 +373,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNUMBER() {
this.name = "ISNUMBER";
this.value = null;
......@@ -382,7 +409,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISODD() {
this.name = "ISODD";
this.value = null;
......@@ -420,7 +450,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISREF() {
this.name = "ISREF";
this.value = null;
......@@ -445,7 +478,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISTEXT() {
this.name = "ISTEXT";
this.value = null;
......@@ -478,7 +514,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cN() {
this.name = "N";
this.value = null;
......@@ -525,7 +564,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNA() {
this.name = "NA";
this.value = null;
......@@ -545,7 +587,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTYPE() {
this.name = "TYPE";
this.value = null;
......
......@@ -53,7 +53,10 @@
cFormulaFunctionGroup['Logical'] = cFormulaFunctionGroup['Logical'] || [];
cFormulaFunctionGroup['Logical'].push(cAND, cFALSE, cIF, cIFERROR, cNOT, cOR, cTRUE);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cAND() {
this.name = "AND";
this.value = null;
......@@ -129,7 +132,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cFALSE() {
this.name = "FALSE";
this.value = null;
......@@ -149,7 +155,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIF() {
this.name = "IF";
this.value = null;
......@@ -192,7 +201,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIFERROR() {
this.name = "IFERROR";
this.value = null;
......@@ -227,7 +239,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNOT() {
this.name = "NOT";
this.value = null;
......@@ -267,7 +282,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOR() {
this.name = "OR";
this.value = null;
......@@ -340,7 +358,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTRUE() {
this.name = "TRUE";
this.value = null;
......
......@@ -94,7 +94,10 @@
return new RegExp(vFS + "$", flags ? flags : "i");
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cADDRESS() {
this.name = "ADDRESS";
this.value = null;
......@@ -191,11 +194,11 @@
}
strRef = this._getRef(this._absolute(absR, rowNumber, A1RefType),
this._absolute(absC, A1RefType ? g_oCellAddressUtils.colnumToColstrFromWsView(colNumber) : colNumber, A1RefType),
A1RefType);
this._absolute(absC, A1RefType ? g_oCellAddressUtils.colnumToColstrFromWsView(colNumber) : colNumber,
A1RefType), A1RefType);
return this.value =
new cString((cElementType.empty === sheetName.type) ? strRef : parserHelp.get3DRef(sheetName.toString(), strRef));
return this.value = new cString((cElementType.empty === sheetName.type) ? strRef :
parserHelp.get3DRef(sheetName.toString(), strRef));
};
cADDRESS.prototype._getRef = function (row, col, A1RefType) {
return A1RefType ? col + row : 'R' + row + 'C' + col;
......@@ -211,7 +214,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cAREAS() {
cBaseFunction.call(this, "AREAS");
}
......@@ -219,7 +225,10 @@
cAREAS.prototype = Object.create(cBaseFunction.prototype);
cAREAS.prototype.constructor = cAREAS;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCHOOSE() {
this.name = "CHOOSE";
this.value = null;
......@@ -258,7 +267,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCOLUMN() {
this.name = "COLUMN";
this.value = null;
......@@ -289,7 +301,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCOLUMNS() {
this.name = "COLUMNS";
this.value = null;
......@@ -318,7 +333,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cGETPIVOTDATA() {
cBaseFunction.call(this, "GETPIVOTDATA");
}
......@@ -326,7 +344,10 @@
cGETPIVOTDATA.prototype = Object.create(cBaseFunction.prototype);
cGETPIVOTDATA.prototype.constructor = cGETPIVOTDATA;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHLOOKUP() {
this.name = "HLOOKUP";
this.value = null;
......@@ -435,7 +456,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cHYPERLINK() {
cBaseFunction.call(this, "HYPERLINK");
}
......@@ -443,7 +467,10 @@
cHYPERLINK.prototype = Object.create(cBaseFunction.prototype);
cHYPERLINK.prototype.constructor = cHYPERLINK;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cINDEX() {
this.name = "INDEX";
this.value = null;
......@@ -455,9 +482,9 @@
cINDEX.prototype = Object.create(cBaseFunction.prototype);
cINDEX.prototype.constructor = cINDEX;
cINDEX.prototype.Calculate = function (arg) {
var arg0 = arg[0], arg1 = arg[1] && (cElementType.empty !== arg[1].type) ? arg[1] : new cNumber(1), arg2 = arg[2] &&
(cElementType.empty !== arg[2].type) ? arg[2] : new cNumber(1), arg3 = arg[3] &&
(cElementType.empty !== arg[3].type) ? arg[3] : new cNumber(1), res;
var arg0 = arg[0], arg1 = arg[1] && (cElementType.empty !== arg[1].type) ? arg[1] :
new cNumber(1), arg2 = arg[2] && (cElementType.empty !== arg[2].type) ? arg[2] :
new cNumber(1), arg3 = arg[3] && (cElementType.empty !== arg[3].type) ? arg[3] : new cNumber(1), res;
if (cElementType.cellsRange3D === arg0.type) {
arg0 = arg0.tocArea();
......@@ -495,14 +522,16 @@
} else {
if (arg1 == 0 && arg2 > 0) {
var _a1 = ws.getRange3(bbox.r1, bbox.c1 + arg2 - 1, bbox.r1, bbox.c2 + arg2 - 1)
.getCells()[0].getName(), _a2 = ws.getRange3(bbox.r2, bbox.c1 + arg2 - 1, bbox.r2, bbox.c2 + arg2 - 1)
.getCells()[0].getName(), _a2 = ws.getRange3(bbox.r2, bbox.c1 + arg2 - 1, bbox.r2,
bbox.c2 + arg2 - 1)
.getCells()[0].getName();
res = new cArea(_a1.toString() + ":" + _a2.toString(), ws);
} else {
if (arg1 > Math.abs(bbox.r1 - bbox.r2) + 1 || arg2 > Math.abs(bbox.c1 - bbox.c2) + 1) {
res = new cError(cErrorType.bad_reference);
} else {
res = new cRef(ws.getRange3(bbox.r1 + arg1 - 1, bbox.c1 + arg2 - 1, bbox.r1 + arg1 - 1, bbox.c1 + arg2 - 1)
res = new cRef(ws.getRange3(bbox.r1 + arg1 - 1, bbox.c1 + arg2 - 1, bbox.r1 + arg1 - 1,
bbox.c1 + arg2 - 1)
.getCells()[0].getName(), ws);
}
}
......@@ -525,7 +554,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cINDIRECT() {
this.name = "INDIRECT";
this.value = null;
......@@ -600,7 +632,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cLOOKUP() {
this.name = "LOOKUP";
this.value = null;
......@@ -643,7 +678,8 @@
}
if (cElementType.array === arg1.type && cElementType.array === arg2.type) {
if (arg1.getRowCount() != arg2.getRowCount() && arg1.getCountElementInRow() != arg2.getCountElementInRow()) {
if (arg1.getRowCount() != arg2.getRowCount() &&
arg1.getCountElementInRow() != arg2.getCountElementInRow()) {
return this.value = new cError(cErrorType.not_available);
}
......@@ -746,7 +782,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cMATCH() {
this.name = "MATCH";
this.value = null;
......@@ -764,7 +803,8 @@
var i, item, a1RowCount = a1.length, a1ColumnCount = a1[0].length, a2Value = a2.getValue(), arr, index = -1;
var a0Type = a0.type;
var a0Value = a0.getValue();
if(!(cElementType.number === a0Type || cElementType.string === a0Type || cElementType.bool === a0Type || cElementType.error === a0Type || cElementType.empty === a0Type)) {
if (!(cElementType.number === a0Type || cElementType.string === a0Type || cElementType.bool === a0Type ||
cElementType.error === a0Type || cElementType.empty === a0Type)) {
a0Type = a0Value.type;
a0Value = a0Value.getValue();
}
......@@ -852,7 +892,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOFFSET() {
this.name = "OFFSET";
this.value = null;
......@@ -953,7 +996,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cROW() {
this.name = "ROW";
this.value = null;
......@@ -984,7 +1030,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cROWS() {
this.name = "ROWS";
this.value = null;
......@@ -1013,7 +1062,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cRTD() {
cBaseFunction.call(this, "RTD");
}
......@@ -1021,7 +1073,10 @@
cRTD.prototype = Object.create(cBaseFunction.prototype);
cRTD.prototype.constructor = cRTD;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTRANSPOSE() {
this.name = "TRANSPOSE";
this.value = null;
......@@ -1058,7 +1113,8 @@
arg0 = arg0.getMatrix();
} else if (cElementType.cell === arg0.type || cElementType.cell3D === arg0.type) {
return this.value = arg0.getValue();
} else if (cElementType.number === arg0.type || cElementType.string === arg0.type || cElementType.bool === arg0.type || cElementType.error === arg0.type) {
} else if (cElementType.number === arg0.type || cElementType.string === arg0.type ||
cElementType.bool === arg0.type || cElementType.error === arg0.type) {
return this.value = arg0;
} else {
return this.value = new cError(cErrorType.not_available);
......@@ -1073,7 +1129,9 @@
};
};
/** @constructor */
/**
* @constructor
*/
function VHLOOKUPCache(bHor) {
this.cacheId = {};
this.cacheRanges = {};
......@@ -1155,7 +1213,10 @@
this.cacheRanges = {};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cVLOOKUP() {
this.name = "VLOOKUP";
this.value = null;
......
This diff is collapsed.
......@@ -42,7 +42,6 @@
var g_oFormatParser = AscCommon.g_oFormatParser;
var oNumFormatCache = AscCommon.oNumFormatCache;
var cElementType = AscCommonExcel.cElementType;
var cErrorType = AscCommonExcel.cErrorType;
var cNumber = AscCommonExcel.cNumber;
var cString = AscCommonExcel.cString;
......@@ -61,7 +60,10 @@
cFIND, cFINDB, cFIXED, cJIS, cLEFT, cLEFTB, cLEN, cLENB, cLOWER, cMID, cMIDB, cPHONETIC, cPROPER, cREPLACE,
cREPLACEB, cREPT, cRIGHT, cRIGHTB, cSEARCH, cSEARCHB, cSUBSTITUTE, cT, cTEXT, cTRIM, cUPPER, cVALUE);
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cASC() {
cBaseFunction.call(this, "ASC");
}
......@@ -69,7 +71,10 @@
cASC.prototype = Object.create(cBaseFunction.prototype);
cASC.prototype.constructor = cASC;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cBAHTTEXT() {
cBaseFunction.call(this, "BAHTTEXT");
}
......@@ -77,7 +82,10 @@
cBAHTTEXT.prototype = Object.create(cBaseFunction.prototype);
cBAHTTEXT.prototype.constructor = cBAHTTEXT;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCHAR() {
this.name = "CHAR";
this.value = null;
......@@ -124,15 +132,16 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCLEAN() {
this.name = "CLEAN";
this.value = null;
this.argumentsMin = 1;
this.argumentsCurrent = 0;
this.argumentsMax = 1;
}
cCLEAN.prototype = Object.create(cBaseFunction.prototype);
......@@ -165,7 +174,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCODE() {
this.name = "CODE";
this.value = null;
......@@ -212,7 +224,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCONCATENATE() {
this.name = "CONCATENATE";
this.value = null;
......@@ -258,7 +273,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDOLLAR() {
this.name = "DOLLAR";
this.value = null;
......@@ -459,7 +477,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cEXACT() {
this.name = "EXACT";
this.value = null;
......@@ -507,7 +528,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cFIND() {
this.name = "FIND";
this.value = null;
......@@ -602,7 +626,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cFIXED() {
this.name = "FIXED";
this.value = null;
......@@ -800,7 +827,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cJIS() {
cBaseFunction.call(this, "JIS");
}
......@@ -808,7 +838,10 @@
cJIS.prototype = Object.create(cBaseFunction.prototype);
cJIS.prototype.constructor = cJIS;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cLEFT() {
this.name = "LEFT";
this.value = null;
......@@ -867,7 +900,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cLEN() {
this.name = "LEN";
this.value = null;
......@@ -910,7 +946,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cLOWER() {
this.name = "LOWER";
this.value = null;
......@@ -945,7 +984,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cMID() {
this.name = "MID";
this.value = null;
......@@ -1024,7 +1066,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cPHONETIC() {
cBaseFunction.call(this, "PHONETIC");
}
......@@ -1032,7 +1077,10 @@
cPHONETIC.prototype = Object.create(cBaseFunction.prototype);
cPHONETIC.prototype.constructor = cPHONETIC;
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cPROPER() {
this.name = "PROPER";
this.value = null;
......@@ -1100,7 +1148,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cREPLACE() {
this.name = "REPLACE";
this.value = null;
......@@ -1187,7 +1238,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cREPT() {
this.name = "REPT";
this.value = null;
......@@ -1251,7 +1305,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cRIGHT() {
this.name = "RIGHT";
this.value = null;
......@@ -1310,7 +1367,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cSEARCH() {
this.name = "SEARCH";
this.value = null;
......@@ -1409,7 +1469,10 @@
return r;
}
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cSUBSTITUTE() {
this.name = "SUBSTITUTE";
this.value = null;
......@@ -1492,7 +1555,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cT() {
this.name = "T";
this.value = null;
......@@ -1527,7 +1593,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTEXT() {
this.name = "TEXT";
this.value = null;
......@@ -1600,7 +1669,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTRIM() {
this.name = "TRIM";
this.value = null;
......@@ -1638,7 +1710,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cUPPER() {
this.name = "UPPER";
this.value = null;
......@@ -1671,7 +1746,10 @@
};
};
/** @constructor */
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cVALUE() {
this.name = "VALUE";
this.value = null;
......
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