Merge pull request PHPOffice#446 from wiseloren/develop

CP21454 "No Impact" conditional formatting fix for NumberFormat
omcrn · Nov 13, 2014 · 184c1bc · 184c1bc
2 parents 27e64c1 + 26aa0b2
commit 184c1bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Classes/PHPExcel/Style/NumberFormat.php b/Classes/PHPExcel/Style/NumberFormat.php
@@ -120,6 +120,7 @@ public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
 
 		if ($isConditional) {
 			$this->_formatCode = NULL;
+			$this->_builtInFormatCode = FALSE;
 		}
 	}
 

diff --git a/changelog.txt b/changelog.txt
@@ -45,6 +45,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):
-Original file line number
+Diff line change
@@ Expand Up @@
     		if ($isConditional) {
     			$this->_formatCode = NULL;
+    			$this->_builtInFormatCode = FALSE;
     		}
     	}
@@ Expand Down @@