From c20c5f6ac81094848dc03a7b345470afbbdbc975 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Sat, 14 Jul 2012 00:40:55 +0100 Subject: [PATCH] Bugfix: (wackonline) OOCalc Reader fix for NULL cells --- Classes/PHPExcel/Reader/OOCalc.php | 5 ++++- changelog.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Reader/OOCalc.php b/Classes/PHPExcel/Reader/OOCalc.php index 3760f0d3..242b0e8a 100644 --- a/Classes/PHPExcel/Reader/OOCalc.php +++ b/Classes/PHPExcel/Reader/OOCalc.php @@ -533,7 +533,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader } if (isset($cellDataText->p)) { - // Consolodate if there are multiple p records (maybe with spans as well) + // Consolidate if there are multiple p records (maybe with spans as well) $dataArray = array(); // Text can have multiple text:p and within those, multiple text:span. // text:p newlines, but text:span does not. @@ -597,6 +597,9 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader // if ($hyperlink !== NULL) { // echo 'Hyperlink is '.$hyperlink.'
'; // } + } else { + $type = PHPExcel_Cell_DataType::TYPE_NULL; + $dataValue = null; } if ($hasCalculatedValue) { diff --git a/changelog.txt b/changelog.txt index cc7f5a09..06eac57d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -36,6 +36,7 @@ Fixed in develop branch: Rendered as a 4-digit CE year in non-Excel outputs - Bugfix: (MBaker) Work items 15799 and 18278 - Background color cell is always black when editing cell - Bugfix: (MBaker) Work items 15905 and 18183 - Allow "no impact" to formats on Conditional Formatting +- Bugfix: (wackonline) OOCalc Reader fix for NULL cells 2012-05-19 (v1.7.7):