From 26aa0b27f7d1df55183c23c9f4a0411bbe389b53 Mon Sep 17 00:00:00 2001 From: Loren Klingman Date: Wed, 15 Oct 2014 11:32:27 -0500 Subject: [PATCH] "No Impact" conditional formatting fix for NumberFormat --- Classes/PHPExcel/Style/NumberFormat.php | 1 + changelog.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/Classes/PHPExcel/Style/NumberFormat.php b/Classes/PHPExcel/Style/NumberFormat.php index 0d7d93de..e098f6f2 100644 --- a/Classes/PHPExcel/Style/NumberFormat.php +++ b/Classes/PHPExcel/Style/NumberFormat.php @@ -120,6 +120,7 @@ class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements P if ($isConditional) { $this->_formatCode = NULL; + $this->_builtInFormatCode = FALSE; } } diff --git a/changelog.txt b/changelog.txt index 3bb1ab5c..59a26519 100644 --- a/changelog.txt +++ b/changelog.txt @@ -42,6 +42,7 @@ Planned for v1.8.1 - 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: (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):