From cdbeceba47e9a9694f3bad053e7c47b97773c28b Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Fri, 25 Nov 2011 12:16:01 +0000
Subject: [PATCH] Bugfix: Work item 16895 - PHP Invalid index notice on writing
 excel file when active sheet has been deleted General: Work item 16923 -
 Datatype.php & constant TYPE_NULL

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@83260 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel.php                          |   6 ++++++
 Classes/PHPExcel/Cell/DataType.php            |   2 +-
 Classes/PHPExcel/Reader/CSV.php               |   2 +-
 Classes/PHPExcel/Reader/Excel2003XML.php      |   2 +-
 Classes/PHPExcel/Writer/Excel5/Worksheet.php  |   1 +
 .../Functionality Cross-Reference.xls         | Bin 37376 -> 37376 bytes
 changelog.txt                                 |   2 ++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Classes/PHPExcel.php b/Classes/PHPExcel.php
index bc852080..df111d47 100644
--- a/Classes/PHPExcel.php
+++ b/Classes/PHPExcel.php
@@ -244,6 +244,12 @@ class PHPExcel
 		} else {
 			array_splice($this->_workSheetCollection, $pIndex, 1);
 		}
+		// Adjust active sheet index if necessary
+		if (($this->_activeSheetIndex >= $pIndex) &&
+			($pIndex > count($this->_workSheetCollection) - 1)) {
+			--$this->_activeSheetIndex;
+		}
+
 	}
 
 	/**
diff --git a/Classes/PHPExcel/Cell/DataType.php b/Classes/PHPExcel/Cell/DataType.php
index 775d99da..e2410b3e 100644
--- a/Classes/PHPExcel/Cell/DataType.php
+++ b/Classes/PHPExcel/Cell/DataType.php
@@ -41,7 +41,7 @@ class PHPExcel_Cell_DataType
 	const TYPE_FORMULA		= 'f';
 	const TYPE_NUMERIC		= 'n';
 	const TYPE_BOOL			= 'b';
-    const TYPE_NULL			= 's';
+    const TYPE_NULL			= 'null';
     const TYPE_INLINE		= 'inlineStr';
 	const TYPE_ERROR		= 'e';
 
diff --git a/Classes/PHPExcel/Reader/CSV.php b/Classes/PHPExcel/Reader/CSV.php
index ee342acb..dfc0280f 100644
--- a/Classes/PHPExcel/Reader/CSV.php
+++ b/Classes/PHPExcel/Reader/CSV.php
@@ -217,7 +217,7 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		}
 		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
 
-		$lineEnding = ini_set('auto_detect_line_endings');
+		$lineEnding = ini_get('auto_detect_line_endings');
 		ini_set('auto_detect_line_endings', true);
 
 		// Open file
diff --git a/Classes/PHPExcel/Reader/Excel2003XML.php b/Classes/PHPExcel/Reader/Excel2003XML.php
index 6e437de6..608bfe23 100644
--- a/Classes/PHPExcel/Reader/Excel2003XML.php
+++ b/Classes/PHPExcel/Reader/Excel2003XML.php
@@ -651,7 +651,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 									const TYPE_FORMULA		= 'f';
 									const TYPE_NUMERIC		= 'n';
 									const TYPE_BOOL			= 'b';
-								    const TYPE_NULL			= 's';
+								    const TYPE_NULL			= 'null';
 								    const TYPE_INLINE		= 'inlineStr';
 									const TYPE_ERROR		= 'e';
 									*/
diff --git a/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
index 8efe3153..baa72a4a 100644
--- a/Classes/PHPExcel/Writer/Excel5/Worksheet.php
+++ b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
@@ -410,6 +410,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 			} else {
 				switch ($cell->getDatatype()) {
 					case PHPExcel_Cell_DataType::TYPE_STRING:
+					case PHPExcel_Cell_DataType::TYPE_NULL:
 						if ($cVal === '' || $cVal === null) {
 							$this->_writeBlank($row, $column, $xfIndex);
 						} else {
diff --git a/Documentation/Functionality Cross-Reference.xls b/Documentation/Functionality Cross-Reference.xls
index e25107a2fcbf372fc57f2bb063408016097c7024..c70fa93735747123f663bea50c545267981e0766 100644
GIT binary patch
delta 30
mcmZoz!ql*YX@dq6Bg<w@Cg(m5fvl8}_W5TRH<wK4VFUn{@d``;

delta 25
hcmZoz!ql*YX@dq6BiCk4Cg;A%x%M2JOD6O%0sw4d2y6fV

diff --git a/changelog.txt b/changelog.txt
index 3015f5c4..cbacf025 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -40,9 +40,11 @@ Fixed in SVN:
                      auto_detect_line_endings now set in CSV reader
 - Bugfix:   (MBaker) Work item 16212 - $arguments improperly used in CachedObjectStorage/PHPTemp.php
 - Bugfix:   (MBaker) Work item 16643 - Bug In Cache System (cell reference when throwing caching errors)
+- Bugfix:   (MBaker) Work item 16895 - PHP Invalid index notice on writing excel file when active sheet has been deleted
 - General:  (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
 - General:  (MBaker) Work item 15461 - Locale file paths not fit for windows
 - General:  (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM
+- General:  (MBaker) Work item 16923 - Datatype.php & constant TYPE_NULL
 
 
 2011-02-27 (v1.7.6):