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

fixed:

Bug 24783 - Не игнорируются пустые ячейки и текст в массиве или ссылке при вычисления функции STDEVPA

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56658 954022d7-b5bf-4e40-9824-e11837661b57
parent 728d992e
...@@ -4785,7 +4785,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) { ...@@ -4785,7 +4785,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) {
else if ( elem instanceof cBool ) { else if ( elem instanceof cBool ) {
arr0.push( elem.tocNumber() ); arr0.push( elem.tocNumber() );
} }
else { else if ( elem instanceof cString ) {
arr0.push( new cNumber( 0 ) ); arr0.push( new cNumber( 0 ) );
} }
} ); } );
...@@ -4798,7 +4798,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) { ...@@ -4798,7 +4798,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) {
else if ( a instanceof cBool ) { else if ( a instanceof cBool ) {
arr0.push( a.tocNumber() ); arr0.push( a.tocNumber() );
} }
else { else if ( a instanceof cString ) {
arr0.push( new cNumber( 0 ) ); arr0.push( new cNumber( 0 ) );
} }
} }
...@@ -4810,7 +4810,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) { ...@@ -4810,7 +4810,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) {
else if ( elem instanceof cBool ) { else if ( elem instanceof cBool ) {
arr0.push( elem.tocNumber() ); arr0.push( elem.tocNumber() );
} }
else { else if ( elem instanceof cString ) {
arr0.push( new cNumber( 0 ) ); arr0.push( new cNumber( 0 ) );
} }
} ); } );
...@@ -4818,7 +4818,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) { ...@@ -4818,7 +4818,7 @@ cSTDEVPA.prototype.Calculate = function ( arg ) {
else if ( arg[j] instanceof cNumber || arg[j] instanceof cBool ) { else if ( arg[j] instanceof cNumber || arg[j] instanceof cBool ) {
arr0.push( arg[j].tocNumber() ); arr0.push( arg[j].tocNumber() );
} }
else if ( arg[j] instanceof cString || arg[j] instanceof cEmpty ) { else if ( arg[j] instanceof cString ) {
arr0.push( new cNumber( 0 ) ); arr0.push( new cNumber( 0 ) );
} }
else else
......
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