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

Add check to avoid possible error #943

Open
wants to merge 1 commit into
base: 1.8
Choose a base branch
from
Open

Add check to avoid possible error #943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 27 additions & 25 deletions Classes/PHPExcel/Reader/Excel2007.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,33 +544,35 @@ public function load($pFilename)
self::readStyle($objStyle, $style);
$excel->addCellXf($objStyle);
}

foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
if ($numFmts && $xf["numFmtId"]) {
$tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
if (isset($tmpNumFmt["formatCode"])) {
$numFmt = (string) $tmpNumFmt["formatCode"];
} elseif ((int)$xf["numFmtId"] < 165) {
$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);

if ( is_array($xmlStyles->cellStyleXfs->xf) || is_object($xmlStyles->cellStyleXfs->xf) ) {
foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
if ($numFmts && $xf["numFmtId"]) {
$tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
if (isset($tmpNumFmt["formatCode"])) {
$numFmt = (string) $tmpNumFmt["formatCode"];
} elseif ((int)$xf["numFmtId"] < 165) {
$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
}
}

$cellStyle = (object) array(
"numFmt" => $numFmt,
"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
"alignment" => $xf->alignment,
"protection" => $xf->protection,
"quotePrefix" => $quotePrefix,
);
$cellStyles[] = $cellStyle;

// add style to cellStyleXf collection
$objStyle = new PHPExcel_Style;
self::readStyle($objStyle, $cellStyle);
$excel->addCellStyleXf($objStyle);
}

$cellStyle = (object) array(
"numFmt" => $numFmt,
"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
"alignment" => $xf->alignment,
"protection" => $xf->protection,
"quotePrefix" => $quotePrefix,
);
$cellStyles[] = $cellStyle;

// add style to cellStyleXf collection
$objStyle = new PHPExcel_Style;
self::readStyle($objStyle, $cellStyle);
$excel->addCellStyleXf($objStyle);
}
}

Expand Down