From 6710c8a136769ca9074505bbda42ea09c77aaa33 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Tue, 26 Jun 2012 21:08:11 +0100 Subject: [PATCH] Bugfix: Work items 15799 and 18278 Background color cell is always black when editing cell --- Classes/PHPExcel/Writer/Excel2007/Style.php | 18 ++++++++++-------- changelog.txt | 4 +++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Classes/PHPExcel/Writer/Excel2007/Style.php b/Classes/PHPExcel/Writer/Excel2007/Style.php index 1cc33429..f16c950b 100644 --- a/Classes/PHPExcel/Writer/Excel2007/Style.php +++ b/Classes/PHPExcel/Writer/Excel2007/Style.php @@ -245,15 +245,17 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa $objWriter->startElement('patternFill'); $objWriter->writeAttribute('patternType', $pFill->getFillType()); - // fgColor - $objWriter->startElement('fgColor'); - $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB()); - $objWriter->endElement(); + if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) { + // fgColor + $objWriter->startElement('fgColor'); + $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB()); + $objWriter->endElement(); - // bgColor - $objWriter->startElement('bgColor'); - $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB()); - $objWriter->endElement(); + // bgColor + $objWriter->startElement('bgColor'); + $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB()); + $objWriter->endElement(); + } $objWriter->endElement(); diff --git a/changelog.txt b/changelog.txt index ed79edc9..c258055f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -23,7 +23,7 @@ ************************************************************************************** -Fixed in SVN: +Fixed in develop branch: - Feature: (MBaker) Refactor PDF Writer to allow use with a choice of PDF Rendering library rather than restricting to tcPDF Current options are tcPDF, mPDF, DomPDF @@ -33,6 +33,8 @@ Fixed in SVN: - Bugfix: (schir1964) Fix to listWorksheetInfo() method for OOCalc Reader - Bugfix: (MBaker) Support for "e" (epoch) date format mask Rendered as a 4-digit CE year in non-Excel outputs +- Bugfix: (MBaker) Work items 15799 and 18278 - Background color cell is always black when editing cell + 2012-05-19 (v1.7.7): - Bugfix: (Progi1984) Work item 8916 - Support for Rich-Text in PHPExcel_Writer_Excel5