Commit 20627c34 authored by Alexander.Trofimov's avatar Alexander.Trofimov

update cArea getValue method

parent 371cc33e
...@@ -595,32 +595,7 @@ cArea.prototype.getValue = function () { ...@@ -595,32 +595,7 @@ cArea.prototype.getValue = function () {
val.push( new cError( cErrorType.bad_reference ) ); val.push( new cError( cErrorType.bad_reference ) );
} else { } else {
r._foreachNoEmpty( function ( cell ) { r._foreachNoEmpty( function ( cell ) {
var cellType = cell.getType(); val.push(checkTypeCell2(cell));
switch ( cellType ) {
case CellValueType.Number:
cell.getValueWithoutFormat() === "" ? val.push(new cEmpty()) :
val.push(new cNumber(cell.getValueWithoutFormat()));
break;
case CellValueType.Bool:
val.push( new cBool( cell.getValueWithoutFormat() ) );
break;
case CellValueType.Error:
val.push( new cError( cell.getValueWithoutFormat() ) );
break;
case CellValueType.String:
val.push( new cString( cell.getValueWithoutFormat() ) );
break;
default:
if ( cell.getValueWithoutFormat() && cell.getValueWithoutFormat() !== "" ) {
val.push( new cNumber( cell.getValueWithoutFormat() ) );
} else {
val.push( checkTypeCell( "" + cell.getValueWithoutFormat() ) );
}
}
} ); } );
} }
return val; return val;
......
...@@ -959,11 +959,6 @@ cCORREL.prototype.getInfo = function () { ...@@ -959,11 +959,6 @@ cCORREL.prototype.getInfo = function () {
}; };
function cCOUNT() { function cCOUNT() {
// cBaseFunction.call( this, "COUNT" );
// this.setArgumentsMin( 1 );
// this.setArgumentsMax( 255 );
// this.setFormat( this.formatType.noneFormat );
this.name = "COUNT"; this.name = "COUNT";
this.type = cElementType.func; this.type = cElementType.func;
this.value = null; this.value = null;
...@@ -975,7 +970,6 @@ function cCOUNT() { ...@@ -975,7 +970,6 @@ function cCOUNT() {
noneFormat:-2 noneFormat:-2
}; };
this.numFormat = this.formatType.noneFormat; this.numFormat = this.formatType.noneFormat;
} }
cCOUNT.prototype = Object.create( cBaseFunction.prototype ); cCOUNT.prototype = Object.create( cBaseFunction.prototype );
......
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