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

fix bug 34289

parent c28883f1
This diff is collapsed.
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
cFormulaFunctionGroup['Cube'].push(cCUBEKPIMEMBER, cCUBEMEMBER, cCUBEMEMBERPROPERTY, cCUBERANKEDMEMBER, cCUBESET, cFormulaFunctionGroup['Cube'].push(cCUBEKPIMEMBER, cCUBEMEMBER, cCUBEMEMBERPROPERTY, cCUBERANKEDMEMBER, cCUBESET,
cCUBESETCOUNT, cCUBEVALUE); cCUBESETCOUNT, cCUBEVALUE);
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEKPIMEMBER() { function cCUBEKPIMEMBER() {
this.name = "CUBEKPIMEMBER"; this.name = "CUBEKPIMEMBER";
this.value = null; this.value = null;
...@@ -54,10 +57,13 @@ ...@@ -54,10 +57,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBEKPIMEMBER.prototype = Object.create(cBaseFunction.prototype); cCUBEKPIMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBEKPIMEMBER.prototype.constructor = cCUBEKPIMEMBER; cCUBEKPIMEMBER.prototype.constructor = cCUBEKPIMEMBER;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEMEMBER() { function cCUBEMEMBER() {
this.name = "CUBEMEMBER"; this.name = "CUBEMEMBER";
this.value = null; this.value = null;
...@@ -66,10 +72,13 @@ ...@@ -66,10 +72,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBEMEMBER.prototype = Object.create(cBaseFunction.prototype); cCUBEMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBEMEMBER.prototype.constructor = cCUBEMEMBER; cCUBEMEMBER.prototype.constructor = cCUBEMEMBER;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEMEMBERPROPERTY() { function cCUBEMEMBERPROPERTY() {
this.name = "CUBEMEMBERPROPERTY"; this.name = "CUBEMEMBERPROPERTY";
this.value = null; this.value = null;
...@@ -78,10 +87,13 @@ ...@@ -78,10 +87,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBEMEMBERPROPERTY.prototype = Object.create(cBaseFunction.prototype); cCUBEMEMBERPROPERTY.prototype = Object.create(cBaseFunction.prototype);
cCUBEMEMBERPROPERTY.prototype.constructor = cCUBEMEMBERPROPERTY; cCUBEMEMBERPROPERTY.prototype.constructor = cCUBEMEMBERPROPERTY;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBERANKEDMEMBER() { function cCUBERANKEDMEMBER() {
this.name = "CUBERANKEDMEMBER"; this.name = "CUBERANKEDMEMBER";
this.value = null; this.value = null;
...@@ -90,10 +102,13 @@ ...@@ -90,10 +102,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBERANKEDMEMBER.prototype = Object.create(cBaseFunction.prototype); cCUBERANKEDMEMBER.prototype = Object.create(cBaseFunction.prototype);
cCUBERANKEDMEMBER.prototype.constructor = cCUBERANKEDMEMBER; cCUBERANKEDMEMBER.prototype.constructor = cCUBERANKEDMEMBER;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBESET() { function cCUBESET() {
this.name = "CUBESET"; this.name = "CUBESET";
this.value = null; this.value = null;
...@@ -102,10 +117,13 @@ ...@@ -102,10 +117,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBESET.prototype = Object.create(cBaseFunction.prototype); cCUBESET.prototype = Object.create(cBaseFunction.prototype);
cCUBESET.prototype.constructor = cCUBESET; cCUBESET.prototype.constructor = cCUBESET;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBESETCOUNT() { function cCUBESETCOUNT() {
this.name = "CUBESETCOUNT"; this.name = "CUBESETCOUNT";
this.value = null; this.value = null;
...@@ -114,10 +132,13 @@ ...@@ -114,10 +132,13 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBESETCOUNT.prototype = Object.create(cBaseFunction.prototype); cCUBESETCOUNT.prototype = Object.create(cBaseFunction.prototype);
cCUBESETCOUNT.prototype.constructor = cCUBESETCOUNT; cCUBESETCOUNT.prototype.constructor = cCUBESETCOUNT;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cCUBEVALUE() { function cCUBEVALUE() {
this.name = "CUBEVALUE"; this.name = "CUBEVALUE";
this.value = null; this.value = null;
...@@ -126,6 +147,6 @@ ...@@ -126,6 +147,6 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cCUBEVALUE.prototype = Object.create(cBaseFunction.prototype); cCUBEVALUE.prototype = Object.create(cBaseFunction.prototype);
cCUBEVALUE.prototype.constructor = cCUBEVALUE; cCUBEVALUE.prototype.constructor = cCUBEVALUE;
})(window); })(window);
...@@ -44,99 +44,135 @@ ...@@ -44,99 +44,135 @@
cFormulaFunctionGroup['Database'].push(cDAVERAGE, cDCOUNT, cDCOUNTA, cDGET, cDMAX, cDMIN, cDPRODUCT, cDSTDEV, cFormulaFunctionGroup['Database'].push(cDAVERAGE, cDCOUNT, cDCOUNTA, cDGET, cDMAX, cDMIN, cDPRODUCT, cDSTDEV,
cDSTDEVP, cDSUM, cDVAR, cDVARP); cDSTDEVP, cDSUM, cDVAR, cDVARP);
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDAVERAGE() { function cDAVERAGE() {
cBaseFunction.call(this, "DAVERAGE"); cBaseFunction.call(this, "DAVERAGE");
} }
cDAVERAGE.prototype = Object.create(cBaseFunction.prototype); cDAVERAGE.prototype = Object.create(cBaseFunction.prototype);
cDAVERAGE.prototype.constructor = cDAVERAGE; cDAVERAGE.prototype.constructor = cDAVERAGE;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDCOUNT() { function cDCOUNT() {
cBaseFunction.call(this, "DCOUNT"); cBaseFunction.call(this, "DCOUNT");
} }
cDCOUNT.prototype = Object.create(cBaseFunction.prototype); cDCOUNT.prototype = Object.create(cBaseFunction.prototype);
cDCOUNT.prototype.constructor = cDCOUNT; cDCOUNT.prototype.constructor = cDCOUNT;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDCOUNTA() { function cDCOUNTA() {
cBaseFunction.call(this, "DCOUNTA"); cBaseFunction.call(this, "DCOUNTA");
} }
cDCOUNTA.prototype = Object.create(cBaseFunction.prototype); cDCOUNTA.prototype = Object.create(cBaseFunction.prototype);
cDCOUNTA.prototype.constructor = cDCOUNTA; cDCOUNTA.prototype.constructor = cDCOUNTA;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDGET() { function cDGET() {
cBaseFunction.call(this, "DGET"); cBaseFunction.call(this, "DGET");
} }
cDGET.prototype = Object.create(cBaseFunction.prototype); cDGET.prototype = Object.create(cBaseFunction.prototype);
cDGET.prototype.constructor = cDGET; cDGET.prototype.constructor = cDGET;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDMAX() { function cDMAX() {
cBaseFunction.call(this, "DMAX"); cBaseFunction.call(this, "DMAX");
} }
cDMAX.prototype = Object.create(cBaseFunction.prototype); cDMAX.prototype = Object.create(cBaseFunction.prototype);
cDMAX.prototype.constructor = cDMAX; cDMAX.prototype.constructor = cDMAX;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDMIN() { function cDMIN() {
cBaseFunction.call(this, "DMIN"); cBaseFunction.call(this, "DMIN");
} }
cDMIN.prototype = Object.create(cBaseFunction.prototype); cDMIN.prototype = Object.create(cBaseFunction.prototype);
cDMIN.prototype.constructor = cDMIN; cDMIN.prototype.constructor = cDMIN;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDPRODUCT() { function cDPRODUCT() {
cBaseFunction.call(this, "DPRODUCT"); cBaseFunction.call(this, "DPRODUCT");
} }
cDPRODUCT.prototype = Object.create(cBaseFunction.prototype); cDPRODUCT.prototype = Object.create(cBaseFunction.prototype);
cDPRODUCT.prototype.constructor = cDPRODUCT; cDPRODUCT.prototype.constructor = cDPRODUCT;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSTDEV() { function cDSTDEV() {
cBaseFunction.call(this, "DSTDEV"); cBaseFunction.call(this, "DSTDEV");
} }
cDSTDEV.prototype = Object.create(cBaseFunction.prototype); cDSTDEV.prototype = Object.create(cBaseFunction.prototype);
cDSTDEV.prototype.constructor = cDSTDEV; cDSTDEV.prototype.constructor = cDSTDEV;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSTDEVP() { function cDSTDEVP() {
cBaseFunction.call(this, "DSTDEVP"); cBaseFunction.call(this, "DSTDEVP");
} }
cDSTDEVP.prototype = Object.create(cBaseFunction.prototype); cDSTDEVP.prototype = Object.create(cBaseFunction.prototype);
cDSTDEVP.prototype.constructor = cDSTDEVP; cDSTDEVP.prototype.constructor = cDSTDEVP;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDSUM() { function cDSUM() {
cBaseFunction.call(this, "DSUM"); cBaseFunction.call(this, "DSUM");
} }
cDSUM.prototype = Object.create(cBaseFunction.prototype); cDSUM.prototype = Object.create(cBaseFunction.prototype);
cDSUM.prototype.constructor = cDSUM; cDSUM.prototype.constructor = cDSUM;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDVAR() { function cDVAR() {
cBaseFunction.call(this, "DVAR"); cBaseFunction.call(this, "DVAR");
} }
cDVAR.prototype = Object.create(cBaseFunction.prototype); cDVAR.prototype = Object.create(cBaseFunction.prototype);
cDVAR.prototype.constructor = cDVAR; cDVAR.prototype.constructor = cDVAR;
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cDVARP() { function cDVARP() {
cBaseFunction.call(this, "DVARP"); cBaseFunction.call(this, "DVARP");
} }
cDVARP.prototype = Object.create(cBaseFunction.prototype); cDVARP.prototype = Object.create(cBaseFunction.prototype);
cDVARP.prototype.constructor = cDVARP; cDVARP.prototype.constructor = cDVARP;
})(window); })(window);
...@@ -55,7 +55,10 @@ ...@@ -55,7 +55,10 @@
cFormulaFunctionGroup['Information'].push(cERROR_TYPE, cISBLANK, cISERR, cISERROR, cISEVEN, cISLOGICAL, cISNA, cFormulaFunctionGroup['Information'].push(cERROR_TYPE, cISBLANK, cISERR, cISERROR, cISEVEN, cISLOGICAL, cISNA,
cISNONTEXT, cISNUMBER, cISODD, cISREF, cISTEXT, cN, cNA, cTYPE); cISNONTEXT, cISNUMBER, cISODD, cISREF, cISTEXT, cN, cNA, cTYPE);
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cERROR_TYPE() { function cERROR_TYPE() {
this.name = "ERROR.TYPE"; this.name = "ERROR.TYPE";
this.value = null; this.value = null;
...@@ -64,7 +67,7 @@ ...@@ -64,7 +67,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cERROR_TYPE.prototype = Object.create(cBaseFunction.prototype); cERROR_TYPE.prototype = Object.create(cBaseFunction.prototype);
cERROR_TYPE.prototype.constructor = cERROR_TYPE; cERROR_TYPE.prototype.constructor = cERROR_TYPE;
cERROR_TYPE.prototype.Calculate = function (arg) { cERROR_TYPE.prototype.Calculate = function (arg) {
function typeError(elem) { function typeError(elem) {
...@@ -117,7 +120,10 @@ ...@@ -117,7 +120,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISBLANK() { function cISBLANK() {
this.name = "ISBLANK"; this.name = "ISBLANK";
this.value = null; this.value = null;
...@@ -126,7 +132,7 @@ ...@@ -126,7 +132,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISBLANK.prototype = Object.create(cBaseFunction.prototype); cISBLANK.prototype = Object.create(cBaseFunction.prototype);
cISBLANK.prototype.constructor = cISBLANK; cISBLANK.prototype.constructor = cISBLANK;
cISBLANK.prototype.Calculate = function (arg) { cISBLANK.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -147,7 +153,10 @@ ...@@ -147,7 +153,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISERR() { function cISERR() {
this.name = "ISERR"; this.name = "ISERR";
this.value = null; this.value = null;
...@@ -156,7 +165,7 @@ ...@@ -156,7 +165,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISERR.prototype = Object.create(cBaseFunction.prototype); cISERR.prototype = Object.create(cBaseFunction.prototype);
cISERR.prototype.constructor = cISERR; cISERR.prototype.constructor = cISERR;
cISERR.prototype.Calculate = function (arg) { cISERR.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -180,7 +189,10 @@ ...@@ -180,7 +189,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISERROR() { function cISERROR() {
this.name = "ISERROR"; this.name = "ISERROR";
this.value = null; this.value = null;
...@@ -189,7 +201,7 @@ ...@@ -189,7 +201,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISERROR.prototype = Object.create(cBaseFunction.prototype); cISERROR.prototype = Object.create(cBaseFunction.prototype);
cISERROR.prototype.constructor = cISERROR; cISERROR.prototype.constructor = cISERROR;
cISERROR.prototype.Calculate = function (arg) { cISERROR.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -213,7 +225,10 @@ ...@@ -213,7 +225,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISEVEN() { function cISEVEN() {
this.name = "ISEVEN"; this.name = "ISEVEN";
this.value = null; this.value = null;
...@@ -222,7 +237,7 @@ ...@@ -222,7 +237,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISEVEN.prototype = Object.create(cBaseFunction.prototype); cISEVEN.prototype = Object.create(cBaseFunction.prototype);
cISEVEN.prototype.constructor = cISEVEN; cISEVEN.prototype.constructor = cISEVEN;
cISEVEN.prototype.Calculate = function (arg) { cISEVEN.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -251,7 +266,10 @@ ...@@ -251,7 +266,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISLOGICAL() { function cISLOGICAL() {
this.name = "ISLOGICAL"; this.name = "ISLOGICAL";
this.value = null; this.value = null;
...@@ -260,7 +278,7 @@ ...@@ -260,7 +278,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISLOGICAL.prototype = Object.create(cBaseFunction.prototype); cISLOGICAL.prototype = Object.create(cBaseFunction.prototype);
cISLOGICAL.prototype.constructor = cISLOGICAL; cISLOGICAL.prototype.constructor = cISLOGICAL;
cISLOGICAL.prototype.Calculate = function (arg) { cISLOGICAL.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -284,7 +302,10 @@ ...@@ -284,7 +302,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNA() { function cISNA() {
this.name = "ISNA"; this.name = "ISNA";
this.value = null; this.value = null;
...@@ -293,7 +314,7 @@ ...@@ -293,7 +314,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISNA.prototype = Object.create(cBaseFunction.prototype); cISNA.prototype = Object.create(cBaseFunction.prototype);
cISNA.prototype.constructor = cISNA; cISNA.prototype.constructor = cISNA;
cISNA.prototype.Calculate = function (arg) { cISNA.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -317,7 +338,10 @@ ...@@ -317,7 +338,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNONTEXT() { function cISNONTEXT() {
this.name = "ISNONTEXT"; this.name = "ISNONTEXT";
this.value = null; this.value = null;
...@@ -326,7 +350,7 @@ ...@@ -326,7 +350,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISNONTEXT.prototype = Object.create(cBaseFunction.prototype); cISNONTEXT.prototype = Object.create(cBaseFunction.prototype);
cISNONTEXT.prototype.constructor = cISNONTEXT; cISNONTEXT.prototype.constructor = cISNONTEXT;
cISNONTEXT.prototype.Calculate = function (arg) { cISNONTEXT.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -349,7 +373,10 @@ ...@@ -349,7 +373,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISNUMBER() { function cISNUMBER() {
this.name = "ISNUMBER"; this.name = "ISNUMBER";
this.value = null; this.value = null;
...@@ -358,7 +385,7 @@ ...@@ -358,7 +385,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISNUMBER.prototype = Object.create(cBaseFunction.prototype); cISNUMBER.prototype = Object.create(cBaseFunction.prototype);
cISNUMBER.prototype.constructor = cISNUMBER; cISNUMBER.prototype.constructor = cISNUMBER;
cISNUMBER.prototype.Calculate = function (arg) { cISNUMBER.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -382,7 +409,10 @@ ...@@ -382,7 +409,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISODD() { function cISODD() {
this.name = "ISODD"; this.name = "ISODD";
this.value = null; this.value = null;
...@@ -391,7 +421,7 @@ ...@@ -391,7 +421,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISODD.prototype = Object.create(cBaseFunction.prototype); cISODD.prototype = Object.create(cBaseFunction.prototype);
cISODD.prototype.constructor = cISODD; cISODD.prototype.constructor = cISODD;
cISODD.prototype.Calculate = function (arg) { cISODD.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -420,7 +450,10 @@ ...@@ -420,7 +450,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISREF() { function cISREF() {
this.name = "ISREF"; this.name = "ISREF";
this.value = null; this.value = null;
...@@ -429,7 +462,7 @@ ...@@ -429,7 +462,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISREF.prototype = Object.create(cBaseFunction.prototype); cISREF.prototype = Object.create(cBaseFunction.prototype);
cISREF.prototype.constructor = cISREF; cISREF.prototype.constructor = cISREF;
cISREF.prototype.Calculate = function (arg) { cISREF.prototype.Calculate = function (arg) {
if ((arg[0] instanceof cRef || arg[0] instanceof cArea || arg[0] instanceof cArea3D || if ((arg[0] instanceof cRef || arg[0] instanceof cArea || arg[0] instanceof cArea3D ||
...@@ -445,7 +478,10 @@ ...@@ -445,7 +478,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cISTEXT() { function cISTEXT() {
this.name = "ISTEXT"; this.name = "ISTEXT";
this.value = null; this.value = null;
...@@ -454,7 +490,7 @@ ...@@ -454,7 +490,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cISTEXT.prototype = Object.create(cBaseFunction.prototype); cISTEXT.prototype = Object.create(cBaseFunction.prototype);
cISTEXT.prototype.constructor = cISTEXT; cISTEXT.prototype.constructor = cISTEXT;
cISTEXT.prototype.Calculate = function (arg) { cISTEXT.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -478,7 +514,10 @@ ...@@ -478,7 +514,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cN() { function cN() {
this.name = "N"; this.name = "N";
this.value = null; this.value = null;
...@@ -487,7 +526,7 @@ ...@@ -487,7 +526,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cN.prototype = Object.create(cBaseFunction.prototype); cN.prototype = Object.create(cBaseFunction.prototype);
cN.prototype.constructor = cN; cN.prototype.constructor = cN;
cN.prototype.numFormat = AscCommonExcel.cNumFormatNone; cN.prototype.numFormat = AscCommonExcel.cNumFormatNone;
cN.prototype.Calculate = function (arg) { cN.prototype.Calculate = function (arg) {
...@@ -525,7 +564,10 @@ ...@@ -525,7 +564,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNA() { function cNA() {
this.name = "NA"; this.name = "NA";
this.value = null; this.value = null;
...@@ -534,7 +576,7 @@ ...@@ -534,7 +576,7 @@
this.argumentsMax = 0; this.argumentsMax = 0;
} }
cNA.prototype = Object.create(cBaseFunction.prototype); cNA.prototype = Object.create(cBaseFunction.prototype);
cNA.prototype.constructor = cNA; cNA.prototype.constructor = cNA;
cNA.prototype.Calculate = function () { cNA.prototype.Calculate = function () {
return this.value = new cError(cErrorType.not_available); return this.value = new cError(cErrorType.not_available);
...@@ -545,7 +587,10 @@ ...@@ -545,7 +587,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTYPE() { function cTYPE() {
this.name = "TYPE"; this.name = "TYPE";
this.value = null; this.value = null;
...@@ -554,7 +599,7 @@ ...@@ -554,7 +599,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cTYPE.prototype = Object.create(cBaseFunction.prototype); cTYPE.prototype = Object.create(cBaseFunction.prototype);
cTYPE.prototype.constructor = cTYPE; cTYPE.prototype.constructor = cTYPE;
cTYPE.prototype.Calculate = function (arg) { cTYPE.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
......
...@@ -53,7 +53,10 @@ ...@@ -53,7 +53,10 @@
cFormulaFunctionGroup['Logical'] = cFormulaFunctionGroup['Logical'] || []; cFormulaFunctionGroup['Logical'] = cFormulaFunctionGroup['Logical'] || [];
cFormulaFunctionGroup['Logical'].push(cAND, cFALSE, cIF, cIFERROR, cNOT, cOR, cTRUE); cFormulaFunctionGroup['Logical'].push(cAND, cFALSE, cIF, cIFERROR, cNOT, cOR, cTRUE);
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cAND() { function cAND() {
this.name = "AND"; this.name = "AND";
this.value = null; this.value = null;
...@@ -62,7 +65,7 @@ ...@@ -62,7 +65,7 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cAND.prototype = Object.create(cBaseFunction.prototype); cAND.prototype = Object.create(cBaseFunction.prototype);
cAND.prototype.constructor = cAND; cAND.prototype.constructor = cAND;
cAND.prototype.Calculate = function (arg) { cAND.prototype.Calculate = function (arg) {
var argResult = null; var argResult = null;
...@@ -129,7 +132,10 @@ ...@@ -129,7 +132,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cFALSE() { function cFALSE() {
this.name = "FALSE"; this.name = "FALSE";
this.value = null; this.value = null;
...@@ -138,7 +144,7 @@ ...@@ -138,7 +144,7 @@
this.argumentsMax = 0; this.argumentsMax = 0;
} }
cFALSE.prototype = Object.create(cBaseFunction.prototype); cFALSE.prototype = Object.create(cBaseFunction.prototype);
cFALSE.prototype.constructor = cFALSE; cFALSE.prototype.constructor = cFALSE;
cFALSE.prototype.Calculate = function () { cFALSE.prototype.Calculate = function () {
return this.value = new cBool(false); return this.value = new cBool(false);
...@@ -149,7 +155,10 @@ ...@@ -149,7 +155,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIF() { function cIF() {
this.name = "IF"; this.name = "IF";
this.value = null; this.value = null;
...@@ -158,7 +167,7 @@ ...@@ -158,7 +167,7 @@
this.argumentsMax = 3; this.argumentsMax = 3;
} }
cIF.prototype = Object.create(cBaseFunction.prototype); cIF.prototype = Object.create(cBaseFunction.prototype);
cIF.prototype.constructor = cIF; cIF.prototype.constructor = cIF;
cIF.prototype.Calculate = function (arg) { cIF.prototype.Calculate = function (arg) {
var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2]; var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2];
...@@ -192,7 +201,10 @@ ...@@ -192,7 +201,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cIFERROR() { function cIFERROR() {
this.name = "IFERROR"; this.name = "IFERROR";
this.value = null; this.value = null;
...@@ -201,7 +213,7 @@ ...@@ -201,7 +213,7 @@
this.argumentsMax = 2; this.argumentsMax = 2;
} }
cIFERROR.prototype = Object.create(cBaseFunction.prototype); cIFERROR.prototype = Object.create(cBaseFunction.prototype);
cIFERROR.prototype.constructor = cIFERROR; cIFERROR.prototype.constructor = cIFERROR;
cIFERROR.prototype.Calculate = function (arg) { cIFERROR.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -227,7 +239,10 @@ ...@@ -227,7 +239,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cNOT() { function cNOT() {
this.name = "NOT"; this.name = "NOT";
this.value = null; this.value = null;
...@@ -236,7 +251,7 @@ ...@@ -236,7 +251,7 @@
this.argumentsMax = 1; this.argumentsMax = 1;
} }
cNOT.prototype = Object.create(cBaseFunction.prototype); cNOT.prototype = Object.create(cBaseFunction.prototype);
cNOT.prototype.constructor = cNOT; cNOT.prototype.constructor = cNOT;
cNOT.prototype.Calculate = function (arg) { cNOT.prototype.Calculate = function (arg) {
var arg0 = arg[0]; var arg0 = arg[0];
...@@ -267,7 +282,10 @@ ...@@ -267,7 +282,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cOR() { function cOR() {
this.name = "OR"; this.name = "OR";
this.value = null; this.value = null;
...@@ -276,7 +294,7 @@ ...@@ -276,7 +294,7 @@
this.argumentsMax = 255; this.argumentsMax = 255;
} }
cOR.prototype = Object.create(cBaseFunction.prototype); cOR.prototype = Object.create(cBaseFunction.prototype);
cOR.prototype.constructor = cOR; cOR.prototype.constructor = cOR;
cOR.prototype.Calculate = function (arg) { cOR.prototype.Calculate = function (arg) {
var argResult = null; var argResult = null;
...@@ -340,7 +358,10 @@ ...@@ -340,7 +358,10 @@
}; };
}; };
/** @constructor */ /**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function cTRUE() { function cTRUE() {
this.name = "TRUE"; this.name = "TRUE";
this.value = null; this.value = null;
...@@ -349,7 +370,7 @@ ...@@ -349,7 +370,7 @@
this.argumentsMax = 0; this.argumentsMax = 0;
} }
cTRUE.prototype = Object.create(cBaseFunction.prototype); cTRUE.prototype = Object.create(cBaseFunction.prototype);
cTRUE.prototype.constructor = cTRUE; cTRUE.prototype.constructor = cTRUE;
cTRUE.prototype.Calculate = function () { cTRUE.prototype.Calculate = function () {
return this.value = new cBool(true); return this.value = new cBool(true);
......
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