Remove empty row from empty charts and images

This commit is contained in:
jgilliland 2013-04-16 17:27:20 -05:00
parent db7b99ac8e
commit af01842f78

View File

@ -520,13 +520,13 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$chartCol = PHPExcel_Cell::columnIndexFromString($chartTL[0]); $chartCol = PHPExcel_Cell::columnIndexFromString($chartTL[0]);
if ($chartTL[1] > $rowMax) { if ($chartTL[1] > $rowMax) {
$rowMax = $chartTL[1]; $rowMax = $chartTL[1];
}
if ($chartCol > PHPExcel_Cell::columnIndexFromString($colMax)) { if ($chartCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
$colMax = $chartTL[0]; $colMax = $chartTL[0];
} }
} }
} }
} }
}
foreach ($pSheet->getDrawingCollection() as $drawing) { foreach ($pSheet->getDrawingCollection() as $drawing) {
if ($drawing instanceof PHPExcel_Worksheet_Drawing) { if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
@ -534,15 +534,15 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$imageCol = PHPExcel_Cell::columnIndexFromString($imageTL[0]); $imageCol = PHPExcel_Cell::columnIndexFromString($imageTL[0]);
if ($imageTL[1] > $rowMax) { if ($imageTL[1] > $rowMax) {
$rowMax = $imageTL[1]; $rowMax = $imageTL[1];
}
if ($imageCol > PHPExcel_Cell::columnIndexFromString($colMax)) { if ($imageCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
$colMax = $imageTL[0]; $colMax = $imageTL[0];
} }
} }
} }
}
$html = ''; $html = '';
$colMax++; $colMax++;
while ($row <= $rowMax) { while ($row < $rowMax) {
$html .= '<tr>'; $html .= '<tr>';
for ($col = 'A'; $col != $colMax; ++$col) { for ($col = 'A'; $col != $colMax; ++$col) {
$html .= '<td>'; $html .= '<td>';