xde
This commit is contained in:
parent
28d70194c8
commit
7d2dbf5663
|
|
@ -318,10 +318,10 @@ class PHPExcel_Calculation_Functions
|
||||||
public static function ifCondition($condition)
|
public static function ifCondition($condition)
|
||||||
{
|
{
|
||||||
$condition = PHPExcel_Calculation_Functions::flattenSingleValue($condition);
|
$condition = PHPExcel_Calculation_Functions::flattenSingleValue($condition);
|
||||||
if (!isset($condition{0})) {
|
if (!isset($condition[0])) {
|
||||||
$condition = '=""';
|
$condition = '=""';
|
||||||
}
|
}
|
||||||
if (!in_array($condition{0}, array('>', '<', '='))) {
|
if (!in_array($condition[0], array('>', '<', '='))) {
|
||||||
if (!is_numeric($condition)) {
|
if (!is_numeric($condition)) {
|
||||||
$condition = PHPExcel_Calculation::wrapResult(strtoupper($condition));
|
$condition = PHPExcel_Calculation::wrapResult(strtoupper($condition));
|
||||||
}
|
}
|
||||||
|
|
@ -559,7 +559,7 @@ class PHPExcel_Calculation_Functions
|
||||||
return (integer) $value;
|
return (integer) $value;
|
||||||
case 'string':
|
case 'string':
|
||||||
// Errors
|
// Errors
|
||||||
if ((strlen($value) > 0) && ($value{0} == '#')) {
|
if ((strlen($value) > 0) && ($value[0] == '#')) {
|
||||||
return $value;
|
return $value;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -609,7 +609,7 @@ class PHPExcel_Calculation_Functions
|
||||||
return 64;
|
return 64;
|
||||||
} elseif (is_string($value)) {
|
} elseif (is_string($value)) {
|
||||||
// Errors
|
// Errors
|
||||||
if ((strlen($value) > 0) && ($value{0} == '#')) {
|
if ((strlen($value) > 0) && ($value[0] == '#')) {
|
||||||
return 16;
|
return 16;
|
||||||
}
|
}
|
||||||
return 2;
|
return 2;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user