mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #143 from box/xlsx_skip_empty_cells_on_write

Browse Source 
[XLSX] Skip empty cells on write
This commit is contained in:
Adrien Loison 2015-11-10 17:26:26 -08:00
commit cb5dae22e4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Spout/Writer/XLSX/Internal/Worksheet.php
View File

@ -131,36 +131,38 @@ EOD;
$rowIndex = $this->lastWrittenRowIndex + 1; $rowIndex = $this->lastWrittenRowIndex + 1;
$numCells = count($dataRow); $numCells = count($dataRow);
$data = '<row r="' . $rowIndex . '" spans="1:' . $numCells . '">'; $rowXML = '<row r="' . $rowIndex . '" spans="1:' . $numCells . '">';
foreach($dataRow as $cellValue) { foreach($dataRow as $cellValue) {
$columnIndex = CellHelper::getCellIndexFromColumnIndex($cellNumber); $columnIndex = CellHelper::getCellIndexFromColumnIndex($cellNumber);
$data .= '<c r="' . $columnIndex . $rowIndex . '"'; $cellXML = '<c r="' . $columnIndex . $rowIndex . '"';
$data .= ' s="' . $style->getId() . '"'; $cellXML .= ' s="' . $style->getId() . '"';
if (CellHelper::isNonEmptyString($cellValue)) { if (CellHelper::isNonEmptyString($cellValue)) {
if ($this->shouldUseInlineStrings) { if ($this->shouldUseInlineStrings) {
$data .= ' t="inlineStr"><is><t>' . $this->stringsEscaper->escape($cellValue) . '</t></is></c>'; $cellXML .= ' t="inlineStr"><is><t>' . $this->stringsEscaper->escape($cellValue) . '</t></is></c>';
} else { } else {
$sharedStringId = $this->sharedStringsHelper->writeString($cellValue); $sharedStringId = $this->sharedStringsHelper->writeString($cellValue);
$data .= ' t="s"><v>' . $sharedStringId . '</v></c>'; $cellXML .= ' t="s"><v>' . $sharedStringId . '</v></c>';
} }
} else if (CellHelper::isBoolean($cellValue)) { } else if (CellHelper::isBoolean($cellValue)) {
$data .= ' t="b"><v>' . $cellValue . '</v></c>'; $cellXML .= ' t="b"><v>' . $cellValue . '</v></c>';
} else if (CellHelper::isNumeric($cellValue)) { } else if (CellHelper::isNumeric($cellValue)) {
$data .= '><v>' . $cellValue . '</v></c>'; $cellXML .= '><v>' . $cellValue . '</v></c>';
} else if (empty($cellValue)) { } else if (empty($cellValue)) {
$data .= '/>'; // don't write empty cells (not appending to $cellXML is the right behavior!)
$cellXML = '';
} else { } else {
throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cellValue)); throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cellValue));
} }
$rowXML .= $cellXML;
$cellNumber++; $cellNumber++;
} }
$data .= '</row>'; $rowXML .= '</row>';
$wasWriteSuccessful = fwrite($this->sheetFilePointer, $data); $wasWriteSuccessful = fwrite($this->sheetFilePointer, $rowXML);
if ($wasWriteSuccessful === false) { if ($wasWriteSuccessful === false) {
throw new IOException("Unable to write data in {$this->worksheetFilePath}"); throw new IOException("Unable to write data in {$this->worksheetFilePath}");
} }