Skip to content
This repository has been archived by the owner on Jan 2, 2019. It is now read-only.

Fixed undefined variable error when reading Gnumeric files #212

Closed
wants to merge 2 commits into from
Closed

Fixed undefined variable error when reading Gnumeric files #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e44703
Fixed undefined variable error due to $styleArray being used before i…
IndrekHaav Jul 8, 2013
bc6b02f
Test for cell ref before numeric value
IndrekHaav Aug 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/PHPExcel/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,10 +2738,10 @@ private function _parseFormula($formula, PHPExcel_Cell $pCell = NULL) {
$pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL;

$regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
'|'.self::CALCULATION_REGEXP_CELLREF.
'|'.self::CALCULATION_REGEXP_NUMBER.
'|'.self::CALCULATION_REGEXP_STRING.
'|'.self::CALCULATION_REGEXP_OPENBRACE.
'|'.self::CALCULATION_REGEXP_CELLREF.
'|'.self::CALCULATION_REGEXP_NAMEDRANGE.
'|'.self::CALCULATION_REGEXP_ERROR.
')/si';
Expand Down
2 changes: 1 addition & 1 deletion Classes/PHPExcel/Reader/Gnumeric.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)

// We still set the number format mask for date/time values, even if _readDataOnly is true
if ((!$this->_readDataOnly) ||
(PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
(PHPExcel_Shared_Date::isDateTimeFormatCode($styleAttributes['Format']))) {
$styleArray = array();
$styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
// If _readDataOnly is false, we set all formatting information
Expand Down