mirror of
https://github.com/retailcrm/PHPExcel.git
synced 2024-11-23 22:06:07 +03:00
Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop_2.0.0
This commit is contained in:
commit
df3d41e0a9
@ -1233,7 +1233,9 @@ 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);
|
||||||
$cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
|
if (!$this->_useInlineCss) {
|
||||||
|
$cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write
|
// Write
|
||||||
|
Loading…
Reference in New Issue
Block a user