alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Validation fix to mathematical matrix functions

This commit is contained in:
Mark Baker 2012-08-07 23:44:35 +01:00
parent 938ce8d51f
commit c770117193
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Calculation/MathTrig.php
View File

@ -530,6 +530,7 @@ class PHPExcel_Calculation_MathTrig {
$row = $maxColumn = 0; $row = $maxColumn = 0;
foreach($matrixValues as $matrixRow) { foreach($matrixValues as $matrixRow) {
if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
$column = 0; $column = 0;
foreach($matrixRow as $matrixCell) { foreach($matrixRow as $matrixCell) {
if ((is_string($matrixCell)) || ($matrixCell === null)) { if ((is_string($matrixCell)) || ($matrixCell === null)) {
@ -571,6 +572,7 @@ class PHPExcel_Calculation_MathTrig {
$row = $maxColumn = 0; $row = $maxColumn = 0;
foreach($matrixValues as $matrixRow) { foreach($matrixValues as $matrixRow) {
if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
$column = 0; $column = 0;
foreach($matrixRow as $matrixCell) { foreach($matrixRow as $matrixCell) {
if ((is_string($matrixCell)) || ($matrixCell === null)) { if ((is_string($matrixCell)) || ($matrixCell === null)) {
@ -607,6 +609,7 @@ class PHPExcel_Calculation_MathTrig {
$rowA = 0; $rowA = 0;
foreach($matrixData1 as $matrixRow) { foreach($matrixData1 as $matrixRow) {
if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
$columnA = 0; $columnA = 0;
foreach($matrixRow as $matrixCell) { foreach($matrixRow as $matrixCell) {
if ((is_string($matrixCell)) || ($matrixCell === null)) { if ((is_string($matrixCell)) || ($matrixCell === null)) {
@ -621,6 +624,7 @@ class PHPExcel_Calculation_MathTrig {
$matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData); $matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData);
$rowB = 0; $rowB = 0;
foreach($matrixData2 as $matrixRow) { foreach($matrixData2 as $matrixRow) {
if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
$columnB = 0; $columnB = 0;
foreach($matrixRow as $matrixCell) { foreach($matrixRow as $matrixCell) {
if ((is_string($matrixCell)) || ($matrixCell === null)) { if ((is_string($matrixCell)) || ($matrixCell === null)) {

BIN
Documentation/PHPExcel User Documentation - Reading Spreadsheet Files.doc
View File

Binary file not shown.