Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop_2.0.0

This commit is contained in:
Mark Baker 2013-06-10 23:24:22 +01:00
commit df3d41e0a9

View File

@ -1233,8 +1233,10 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Also apply style from last cell in merge to fix borders - // Also apply style from last cell in merge to fix borders -
// relies on !important for non-none border declarations in _createCSSStyleBorder // relies on !important for non-none border declarations in _createCSSStyleBorder
$endCellCoord = PHPExcel_Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan); $endCellCoord = PHPExcel_Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
if (!$this->_useInlineCss) {
$cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex(); $cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
} }
}
// Write // Write
if ($writeCell) { if ($writeCell) {