From 545c2a0f1945c3f12c08396b37285fa337e8709a Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Thu, 27 Jan 2011 16:09:37 +0000
Subject: [PATCH] Bugfix:	Work item 15172 - rangeToarray function
 modified for non-existent cells

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@67475 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel/Worksheet.php | 5 ++++-
 changelog.txt                  | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php
index 4e3d2b76..f0e93a7e 100644
--- a/Classes/PHPExcel/Worksheet.php
+++ b/Classes/PHPExcel/Worksheet.php
@@ -2190,9 +2190,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 							$returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString($returnValue[$rRef][$cRef], $style->getNumberFormat()->getFormatCode());
 						}
 					} else {
-						// Cell doesn't exist
+						// Cell holds a NULL
 						$returnValue[$rRef][$cRef] = $nullValue;
 					}
+				} else {
+					// Cell doesn't exist
+					$returnValue[$rRef][$cRef] = $nullValue;
 				}
 			}
 		}
diff --git a/changelog.txt b/changelog.txt
index e798455f..c5123b68 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -49,6 +49,7 @@ Fixed in SVN:
 - Bugfix:	(MBaker) Work item 15089 - PHPExcel_Worksheet->toArray() index problem
 - Bugfix:	(MBaker) Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet
 - Bugfix:	(MBaker) Work item 15129 - Worksheet fromArray() only working with 2-D arrays
+- Bugfix:	(MBaker) Work item 15172 - rangeToarray function modified for non-existent cells
 - General:  (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.