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

We shouldn't override any of the built-in MS Excel values (values below id 164) 

But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
So we make allowance for them rather than lose formatting masks
This commit is contained in:
MarkBaker 2015-08-14 19:50:49 +01:00
parent 8af8d3b460
commit 818413ebe0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PhpSpreadsheet/Reader/Excel2007.php
View File

@ -581,7 +581,11 @@ class Excel2007 extends BaseReader implements IReader
} }
} }
if ((int)$xf["numFmtId"] < 164) { // We shouldn't override any of the built-in MS Excel values (values below id 164)
// But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
// So we make allowance for them rather than lose formatting masks
if ((int)$xf["numFmtId"] < 164 &&
\PHPExcel\Style\NumberFormat::builtInFormatCodeIndex((int)$xf["numFmtId"]) !== false) {
$numFmt = \PHPExcel\Style\NumberFormat::builtInFormatCode((int)$xf["numFmtId"]); $numFmt = \PHPExcel\Style\NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
} }
} }
@ -589,8 +593,6 @@ class Excel2007 extends BaseReader implements IReader
if (isset($xf["quotePrefix"])) { if (isset($xf["quotePrefix"])) {
$quotePrefix = (boolean) $xf["quotePrefix"]; $quotePrefix = (boolean) $xf["quotePrefix"];
} }
//$numFmt = str_replace('mm', 'i', $numFmt);
//$numFmt = str_replace('h', 'H', $numFmt);
$style = (object) array( $style = (object) array(
"numFmt" => $numFmt, "numFmt" => $numFmt,