Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into calcEngine

Conflicts:
	Classes/PHPExcel.php
	Classes/PHPExcel/Worksheet.php
This commit is contained in:
Mark Baker
2013-02-13 09:09:28 +00:00
11 changed files with 1496 additions and 1444 deletions
+8
View File
@@ -177,6 +177,14 @@ class PHPExcel
return $this->_calculationEngine;
} // function getCellCacheController()
/**
* Code to execute when this worksheet is unset()
*
*/
function __destruct() {
$this->disconnectWorksheets();
}
/**
* Get properties
*