Commit 48198cc5 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

у функции COUNTBLANK неверно указано допустимое количество аргументов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57286 954022d7-b5bf-4e40-9824-e11837661b57
parent cc3f5af2
......@@ -90,6 +90,7 @@ cFormulaFunction.Statistical = {
'VAR':cVAR,
'VARA':cVARA,
'VARP':cVARP,
// 'VAR.P':cVARdotP,
'VARPA':cVARPA,
'WEIBULL':cWEIBULL,
'ZTEST':cZTEST
......@@ -170,7 +171,6 @@ cAVEDEV.prototype.getInfo = function () {
};
}
function cAVERAGE() {
// cBaseFunction.call( this, "AVERAGE" );
// this.setArgumentsMin( 1 );
......@@ -846,9 +846,9 @@ function cCOUNTBLANK() {
this.name = "COUNTBLANK";
this.type = cElementType.func;
this.value = null;
this.argumentsMin = 4;
this.argumentsMin = 1;
this.argumentsCurrent = 0;
this.argumentsMax = 4;
this.argumentsMax = 1;
this.formatType = {
def:-1, //подразумевается формат первой ячейки входящей в формулу.
noneFormat:-2
......@@ -5266,6 +5266,32 @@ cVARP.prototype.getInfo = function () {
};
}
function cVARdotP() {
// cBaseFunction.call( this, "VARP" );
this.name = "VAR.P";
this.type = cElementType.func;
this.value = null;
this.argumentsMin = 1;
this.argumentsCurrent = 0;
this.argumentsMax = 255;
this.formatType = {
def:-1, //подразумевается формат первой ячейки входящей в формулу.
noneFormat:-2
};
this.numFormat = this.formatType.def;
}
cVARdotP.prototype = Object.create( cBaseFunction.prototype )
cVARdotP.prototype.Calculate = cVARP.prototype.Calculate;
cVARdotP.prototype.getInfo = function () {
return {
name:this.name,
args:"( argument-list )"
};
}
function cVARPA() {
// cBaseFunction.call( this, "VARPA" );
......
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