RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-22 21:36:05 +03:00
Code Issues Projects Releases Wiki Activity

Bugfix: (wackonline) OOCalc Reader fix for NULL cells

Browse Source
This commit is contained in:
Mark Baker 2012-07-14 00:40:55 +01:00
parent e1104f1862
commit c20c5f6ac8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Classes/PHPExcel/Reader/OOCalc.php
View File

@ -533,7 +533,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
} }
if (isset($cellDataText->p)) { 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(); $dataArray = array();
// Text can have multiple text:p and within those, multiple text:span. // Text can have multiple text:p and within those, multiple text:span.
// text:p newlines, but text:span does not. // text:p newlines, but text:span does not.
@ -597,6 +597,9 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
// if ($hyperlink !== NULL) { // if ($hyperlink !== NULL) {
// echo 'Hyperlink is '.$hyperlink.'<br />'; // echo 'Hyperlink is '.$hyperlink.'<br />';
// } // }
} else {
$type = PHPExcel_Cell_DataType::TYPE_NULL;
$dataValue = null;
} }
if ($hasCalculatedValue) { if ($hasCalculatedValue) {

1
changelog.txt
View File

@ -36,6 +36,7 @@ Fixed in develop branch:
Rendered as a 4-digit CE year in non-Excel outputs 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 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: (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): 2012-05-19 (v1.7.7):