geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-18 14:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Work item 13559 - PHPExcel_Writer_PDF does not handle cell borders correctly

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@64268 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker
2010-11-24 14:12:12 +00:00
parent 1f188d3f92
commit b25ced63cc
195 changed files with 62771 additions and 16560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Writer/HTML.php
+18 -10
View File
@@ -736,7 +736,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
// Create CSS
$css = array_merge(
$this->_createCSSStyleAlignment($pStyle->getAlignment())
, $this->_createCSSStyleBorders($pStyle->getBorders())
, $this->_createCSSStyleBorders($pStyle->getBorders(),$pStyle->getFill())
, $this->_createCSSStyleFont($pStyle->getFont())
, $this->_createCSSStyleFill($pStyle->getFill())
);
@@ -804,15 +804,15 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
* @param PHPExcel_Style_Borders $pStyle PHPExcel_Style_Borders
* @return array
*/
private function _createCSSStyleBorders(PHPExcel_Style_Borders $pStyle) {
private function _createCSSStyleBorders(PHPExcel_Style_Borders $pStyle, PHPExcel_Style_Fill $fill) {
// Construct CSS
$css = array();
// Create CSS
$css['border-bottom'] = $this->_createCSSStyleBorder($pStyle->getBottom());
$css['border-top'] = $this->_createCSSStyleBorder($pStyle->getTop());
$css['border-left'] = $this->_createCSSStyleBorder($pStyle->getLeft());
$css['border-right'] = $this->_createCSSStyleBorder($pStyle->getRight());
$css['border-bottom'] = $this->_createCSSStyleBorder($pStyle->getBottom(),$fill);
$css['border-top'] = $this->_createCSSStyleBorder($pStyle->getTop(),$fill);
$css['border-left'] = $this->_createCSSStyleBorder($pStyle->getLeft(),$fill);
$css['border-right'] = $this->_createCSSStyleBorder($pStyle->getRight(),$fill);
// Return
return $css;
@@ -824,12 +824,20 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
* @param PHPExcel_Style_Border $pStyle PHPExcel_Style_Border
* @return string
*/
private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle, PHPExcel_Style_Fill $fill) {
// Construct HTML
$css = '';
// Create CSS
$css .= $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
$borderWidth = $this->_mapBorderStyle($pStyle->getBorderStyle());
if (($borderWidth == '0px') && ($this->_isPdf)) {
// tcPDF treats a 0px border with a colour of black as a thick black border, so we set the colour to the
// background colour for the cell if we're generating PDF output
$bValue = $fill->getFillType() == PHPExcel_Style_Fill::FILL_NONE ? 'FFFFFF' : $fill->getStartColor()->getRGB();
$css .= $borderWidth . ' #' . $bValue;
} else {
$css .= $borderWidth . ' #' . $pStyle->getColor()->getRGB();
}
// Return
return $css;
@@ -888,9 +896,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
$this->_assembleCSS($this->_cssStyles['table']) : '';
if ($this->_isPdf && $pSheet->getShowGridLines()) {
$html .= ' <table border="1" cellpadding="0" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
$html .= ' <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
} else {
$html .= ' <table border="0" cellpadding="0" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
$html .= ' <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
}
}