Merge pull request #446 from wiseloren/develop

CP21454 "No Impact" conditional formatting fix for NumberFormat
This commit is contained in:
Mark Baker 2014-11-13 00:50:56 +00:00
commit 184c1bc290
2 changed files with 2 additions and 0 deletions

View File

@ -120,6 +120,7 @@ class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements P
if ($isConditional) { if ($isConditional) {
$this->_formatCode = NULL; $this->_formatCode = NULL;
$this->_builtInFormatCode = FALSE;
} }
} }

View File

@ -45,6 +45,7 @@ Planned for v1.8.1
- Feature: (CQD) Work Item GH-389 - Additional Mac CJK codepage definitions - Feature: (CQD) Work Item GH-389 - Additional Mac CJK codepage definitions
- Feature: (bolovincev) Work Item GH-269 - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell - Feature: (bolovincev) Work Item GH-269 - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell
- Feature: (MBaker) - New methods added for testing cell status within merge groups - Feature: (MBaker) - New methods added for testing cell status within merge groups
- Bugfix: (wiseloren) Work Item CP21454 - "No Impact" conditional formatting fix for NumberFormat
2014-03-02 (v1.8.0): 2014-03-02 (v1.8.0):