reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Chart/DataSeriesValues.php

Doc Comments +4 added lines, -2 removed lines

@@ -80,6 +80,8 @@ 
 
 	/**
 	 * Create a new PHPExcel_Chart_DataSeriesValues object
+	 * @param string $dataType
+	 * @param string $dataSource
 	 */
 	public function __construct($dataType = null, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
 	{
@@ -191,7 +193,7 @@ 
 	/**
 	 * Identify if the Data Series is a multi-level or a simple series
 	 *
-	 * @return	boolean
+	 * @return	boolean|null
 	 */
 	public function isMultiLevelSeries() {
 		if (count($this->_dataValues) > 0) {
@@ -203,7 +205,7 @@ 
 	/**
 	 * Return the level count of a multi-level Data Series
 	 *
-	 * @return	boolean
+	 * @return	integer
 	 */
 	public function multiLevelCount() {
 		$levelCount = 0;

Indentation +5 added lines, -5 removed lines

@@ -258,12 +258,12 @@
 	}
 
 	public function refresh(PHPExcel_Worksheet $worksheet) {
-        if ($this->_dataSource !== NULL) {
-        	$calcEngine = PHPExcel_Calculation::getInstance();
+		if ($this->_dataSource !== NULL) {
+			$calcEngine = PHPExcel_Calculation::getInstance();
 			$this->_dataValues = PHPExcel_Calculation::_unwrapResult(
-			    $calcEngine->_calculateFormulaValue(
-			        $this->_dataSource
-			    )
+				$calcEngine->_calculateFormulaValue(
+					$this->_dataSource
+				)
 			);
 		}
 	}

Spacing +2 added lines, -2 removed lines

@@ -207,8 +207,8 @@
 	 */
 	public function multiLevelCount() {
 		$levelCount = 0;
-		foreach($this->_dataValues as $dataValueSet) {
-			$levelCount = max($levelCount,count($dataValueSet));
+		foreach ($this->_dataValues as $dataValueSet) {
+			$levelCount = max($levelCount, count($dataValueSet));
 		}
 		return $levelCount;
 	}

app/Vendor/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php

Doc Comments +59 added lines

@@ -71,6 +71,9 @@ 
 	private static $_plotMark	= 0;
 
 
+	/**
+	 * @param string $markerID
+	 */
 	private function _formatPointMarker($seriesPlot,$markerID) {
 		$plotMarkKeys = array_keys(self::$_markSet);
 		if (is_null($markerID)) {
@@ -132,6 +135,9 @@ 
 	}	//	function _formatDataSetLabels()
 
 
+	/**
+	 * @param integer $seriesCount
+	 */
 	private function _percentageSumCalculation($groupID,$seriesCount) {
 		//	Adjust our values to a percentage value across all series in the group
 		for($i = 0; $i < $seriesCount; ++$i) {
@@ -162,6 +168,9 @@ 
 	}	//	function _percentageAdjustValues()
 
 
+	/**
+	 * @param PHPExcel_Chart_Title $captionElement
+	 */
 	private function _getCaption($captionElement) {
 		//	Read any caption
 		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
@@ -263,6 +272,9 @@ 
 	}	//	function _renderRadarPlotArea()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 
@@ -325,6 +337,9 @@ 
 	}	//	function _renderPlotLine()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotBar($groupID, $dimensions = '2d') {
 		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
 		//	Rotate for bar rather than column chart
@@ -409,6 +424,10 @@ 
 	}	//	function _renderPlotBar()
 
 
+	/**
+	 * @param integer $groupID
+	 * @param boolean $bubble
+	 */
 	private function _renderPlotScatter($groupID,$bubble) {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -454,6 +473,9 @@ 
 	}	//	function _renderPlotScatter()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotRadar($groupID) {
 		$radarStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -492,6 +514,9 @@ 
 	}	//	function _renderPlotRadar()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotContour($groupID) {
 		$contourStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -512,6 +537,9 @@ 
 	}	//	function _renderPlotContour()
 
 
+	/**
+	 * @param integer $groupID
+	 */
 	private function _renderPlotStock($groupID) {
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$plotOrder = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
@@ -533,6 +561,9 @@ 
 	}	//	function _renderPlotStock()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderAreaChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_line.php');
 
@@ -544,6 +575,9 @@ 
 	}	//	function _renderAreaChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderLineChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_line.php');
 
@@ -555,6 +589,9 @@ 
 	}	//	function _renderLineChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderBarChart($groupCount, $dimensions = '2d') {
 		require_once('jpgraph_bar.php');
 
@@ -566,6 +603,9 @@ 
 	}	//	function _renderBarChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderScatterChart($groupCount) {
 		require_once('jpgraph_scatter.php');
 		require_once('jpgraph_regstat.php');
@@ -579,6 +619,9 @@ 
 	}	//	function _renderScatterChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderBubbleChart($groupCount) {
 		require_once('jpgraph_scatter.php');
 
@@ -590,6 +633,9 @@ 
 	}	//	function _renderBubbleChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderPieChart($groupCount, $dimensions = '2d', $doughnut = False, $multiplePlots = False) {
 		require_once('jpgraph_pie.php');
 		if ($dimensions == '3d') {
@@ -663,6 +709,9 @@ 
 	}	//	function _renderPieChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderRadarChart($groupCount) {
 		require_once('jpgraph_radar.php');
 
@@ -674,6 +723,9 @@ 
 	}	//	function _renderRadarChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderStockChart($groupCount) {
 		require_once('jpgraph_stock.php');
 
@@ -685,6 +737,10 @@ 
 	}	//	function _renderStockChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 * @param string|null $dimensions
+	 */
 	private function _renderContourChart($groupCount,$dimensions) {
 		require_once('jpgraph_contour.php');
 
@@ -696,6 +752,9 @@ 
 	}	//	function _renderContourChart()
 
 
+	/**
+	 * @param integer $groupCount
+	 */
 	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
 		require_once('jpgraph_line.php');
 		require_once('jpgraph_bar.php');

Spacing +111 added lines, -111 removed lines

@@ -39,18 +39,18 @@ 
  */
 class PHPExcel_Chart_Renderer_jpgraph
 {
-	private static $_width	= 640;
+	private static $_width = 640;
 
-	private static $_height	= 480;
+	private static $_height = 480;
 
-	private static $_colourSet = array( 'mediumpurple1',	'palegreen3',	'gold1',		'cadetblue1',
-										'darkmagenta',		'coral',		'dodgerblue3',	'eggplant',
-										'mediumblue',		'magenta',		'sandybrown',	'cyan',
-										'firebrick1',		'forestgreen',	'deeppink4',	'darkolivegreen',
+	private static $_colourSet = array('mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+										'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+										'mediumblue', 'magenta', 'sandybrown', 'cyan',
+										'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
 										'goldenrod2'
 									  );
 
-	private static $_markSet = array(	'diamond'	=> MARK_DIAMOND,
+	private static $_markSet = array('diamond'	=> MARK_DIAMOND,
 										'square'	=> MARK_SQUARE,
 										'triangle'	=> MARK_UTRIANGLE,
 										'x'			=> MARK_X,
@@ -66,12 +66,12 @@ 
 
 	private $_graph	= null;
 
-	private static $_plotColour	= 0;
+	private static $_plotColour = 0;
 
-	private static $_plotMark	= 0;
+	private static $_plotMark = 0;
 
 
-	private function _formatPointMarker($seriesPlot,$markerID) {
+	private function _formatPointMarker($seriesPlot, $markerID) {
 		$plotMarkKeys = array_keys(self::$_markSet);
 		if (is_null($markerID)) {
 			//	Use default plot marker (next marker in the series)
@@ -98,15 +98,15 @@ 
 	}	//	function _formatPointMarker()
 
 
-	private function _formatDataSetLabels($groupID,$datasetLabels,$rotation = '') {
+	private function _formatDataSetLabels($groupID, $datasetLabels, $rotation = '') {
 		$datasetLabelFormatCode = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-		if (!is_null($datasetLabelFormatCode)) {
+		if ( ! is_null($datasetLabelFormatCode)) {
 			//	Retrieve any label formatting code
 			$datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
 		}
 
 		$testCurrentIndex = 0;
-		foreach($datasetLabels as $i => $datasetLabel) {
+		foreach ($datasetLabels as $i => $datasetLabel) {
 			//	Fill in any missing values in the $datasetLabels array
 			while ($i != $testCurrentIndex) {
 				$datasetLabels[$testCurrentIndex] = '';
@@ -115,14 +115,14 @@ 
 			if (is_array($datasetLabel)) {
 				if ($rotation == 'bar') {
 					$datasetLabel = array_reverse($datasetLabel);
-					$datasetLabels[$i] = implode(" ",$datasetLabel);
+					$datasetLabels[$i] = implode(" ", $datasetLabel);
 				} else {
-					$datasetLabels[$i] = implode("\n",$datasetLabel);
+					$datasetLabels[$i] = implode("\n", $datasetLabel);
 				}
 			} else {
 				//	Format labels according to any formatting code
-				if (!is_null($datasetLabelFormatCode)) {
-					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel,$datasetLabelFormatCode);
+				if ( ! is_null($datasetLabelFormatCode)) {
+					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
 				}
 			}
 			++$testCurrentIndex;
@@ -132,14 +132,14 @@ 
 	}	//	function _formatDataSetLabels()
 
 
-	private function _percentageSumCalculation($groupID,$seriesCount) {
+	private function _percentageSumCalculation($groupID, $seriesCount) {
 		//	Adjust our values to a percentage value across all series in the group
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			if ($i == 0) {
 				$sumValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			} else {
 				$nextValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-				foreach($nextValues as $k => $value) {
+				foreach ($nextValues as $k => $value) {
 					if (isset($sumValues[$k])) {
 						$sumValues[$k] += $value;
 					} else {
@@ -153,8 +153,8 @@ 
 	}	//	function _percentageSumCalculation()
 
 
-	private function _percentageAdjustValues($dataValues,$sumValues) {
-		foreach($dataValues as $k => $dataValue) {
+	private function _percentageAdjustValues($dataValues, $sumValues) {
+		foreach ($dataValues as $k => $dataValue) {
 			$dataValues[$k] = $dataValue / $sumValues[$k] * 100;
 		}
 
@@ -164,13 +164,13 @@ 
 
 	private function _getCaption($captionElement) {
 		//	Read any caption
-		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
+		$caption = ( ! is_null($captionElement)) ? $captionElement->getCaption() : NULL;
 		//	Test if we have a title caption to display
-		if (!is_null($caption)) {
+		if ( ! is_null($caption)) {
 			//	If we do, it could be a plain string or an array
 			if (is_array($caption)) {
 				//	Implode an array to a plain string
-				$caption = implode('',$caption);
+				$caption = implode('', $caption);
 			}
 		}
 		return $caption;
@@ -179,7 +179,7 @@ 
 
 	private function _renderTitle() {
 		$title = $this->_getCaption($this->_chart->getTitle());
-		if (!is_null($title)) {
+		if ( ! is_null($title)) {
 			$this->_graph->title->Set($title);
 		}
 	}	//	function _renderTitle()
@@ -187,32 +187,32 @@ 
 
 	private function _renderLegend() {
 		$legend = $this->_chart->getLegend();
-		if (!is_null($legend)) {
+		if ( ! is_null($legend)) {
 			$legendPosition = $legend->getPosition();
 			$legendOverlay = $legend->getOverlay();
 			switch ($legendPosition) {
 				case 'r'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'right','center');	//	right
+					$this->_graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //	right
 					break;
 				case 'l'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'left','center');	//	left
+					$this->_graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //	left
 					break;
 				case 't'	:
-					$this->_graph->legend->SetPos(0.5,0.01,'center','top');	//	top
+					$this->_graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //	top
 					break;
 				case 'b'	:
-					$this->_graph->legend->SetPos(0.5,0.99,'center','bottom');	//	bottom
+					$this->_graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //	bottom
 					break;
 				default		:
-					$this->_graph->legend->SetPos(0.01,0.01,'right','top');	//	top-right
+					$this->_graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //	top-right
 					break;
 			}
 		}
 	}	//	function _renderLegend()
 
 
-	private function _renderCartesianPlotArea($type='textlin') {
-		$this->_graph = new Graph(self::$_width,self::$_height);
+	private function _renderCartesianPlotArea($type = 'textlin') {
+		$this->_graph = new Graph(self::$_width, self::$_height);
 		$this->_graph->SetScale($type);
 
 		$this->_renderTitle();
@@ -222,10 +222,10 @@ 
 		$reverse = ($rotation == 'bar') ? true : false;
 
 		$xAxisLabel = $this->_chart->getXAxisLabel();
-		if (!is_null($xAxisLabel)) {
+		if ( ! is_null($xAxisLabel)) {
 			$title = $this->_getCaption($xAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->xaxis->SetTitle($title,'center');
+			if ( ! is_null($title)) {
+				$this->_graph->xaxis->SetTitle($title, 'center');
 				$this->_graph->xaxis->title->SetMargin(35);
 				if ($reverse) {
 					$this->_graph->xaxis->title->SetAngle(90);
@@ -235,10 +235,10 @@ 
 		}
 
 		$yAxisLabel = $this->_chart->getYAxisLabel();
-		if (!is_null($yAxisLabel)) {
+		if ( ! is_null($yAxisLabel)) {
 			$title = $this->_getCaption($yAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->yaxis->SetTitle($title,'center');
+			if ( ! is_null($title)) {
+				$this->_graph->yaxis->SetTitle($title, 'center');
 				if ($reverse) {
 					$this->_graph->yaxis->title->SetAngle(0);
 					$this->_graph->yaxis->title->SetMargin(-55);
@@ -249,14 +249,14 @@ 
 
 
 	private function _renderPiePlotArea($doughnut = False) {
-		$this->_graph = new PieGraph(self::$_width,self::$_height);
+		$this->_graph = new PieGraph(self::$_width, self::$_height);
 
 		$this->_renderTitle();
 	}	//	function _renderPiePlotArea()
 
 
 	private function _renderRadarPlotArea() {
-		$this->_graph = new RadarGraph(self::$_width,self::$_height);
+		$this->_graph = new RadarGraph(self::$_width, self::$_height);
 		$this->_graph->SetScale('lin');
 
 		$this->_renderTitle();
@@ -268,29 +268,29 @@ 
 
 		$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
 		if (count($datasetLabels) > 0) {
-			$datasetLabels = $this->_formatDataSetLabels($groupID,$datasetLabels);
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels);
 			$this->_graph->xaxis->SetTickLabels($datasetLabels);
 		}
 
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$seriesPlots = array();
 		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+			$sumValues = $this->_percentageSumCalculation($groupID, $seriesCount);
 		}
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
 
 			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+				$dataValues = $this->_percentageAdjustValues($dataValues, $sumValues);
 			}
 
 			//	Fill in any missing values in the $dataValues array
 			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
+			foreach ($dataValues as $k => $dataValue) {
+				while ($k != $testCurrentIndex) {
 					$dataValues[$testCurrentIndex] = null;
 					++$testCurrentIndex;
 				}
@@ -308,7 +308,7 @@ 
 				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
 			} else {
 				//	Set the appropriate plot marker
-				$this->_formatPointMarker($seriesPlot,$marker);
+				$this->_formatPointMarker($seriesPlot, $marker);
 			}
 			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
 			$seriesPlot->SetLegend($dataLabel);
@@ -335,12 +335,12 @@ 
 
 		$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
 		if (count($datasetLabels) > 0) {
-			$datasetLabels = $this->_formatDataSetLabels($groupID,$datasetLabels,$rotation);
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $rotation);
 			//	Rotate for bar rather than column chart
 			if ($rotation == 'bar') {
 				$datasetLabels = array_reverse($datasetLabels);
 				$this->_graph->yaxis->SetPos('max');
-				$this->_graph->yaxis->SetLabelAlign('center','top');
+				$this->_graph->yaxis->SetLabelAlign('center', 'top');
 				$this->_graph->yaxis->SetLabelSide(SIDE_RIGHT);
 			}
 			$this->_graph->xaxis->SetTickLabels($datasetLabels);
@@ -350,20 +350,20 @@ 
 		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
 		$seriesPlots = array();
 		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+			$sumValues = $this->_percentageSumCalculation($groupID, $seriesCount);
 		}
 
 		//	Loop through each data series in turn
-		for($j = 0; $j < $seriesCount; ++$j) {
+		for ($j = 0; $j < $seriesCount; ++$j) {
 			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
 			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+				$dataValues = $this->_percentageAdjustValues($dataValues, $sumValues);
 			}
 
 			//	Fill in any missing values in the $dataValues array
 			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
+			foreach ($dataValues as $k => $dataValue) {
+				while ($k != $testCurrentIndex) {
 					$dataValues[$testCurrentIndex] = null;
 					++$testCurrentIndex;
 				}
@@ -380,7 +380,7 @@ 
 			if ($dimensions == '3d') {
 				$seriesPlot->SetShadow();
 			}
-			if (!$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
+			if ( ! $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
 				$dataLabel = '';
 			} else {
 				$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
@@ -390,7 +390,7 @@ 
 			$seriesPlots[] = $seriesPlot;
 		}
 		//	Reverse the plot order for bar rather than column chart
-		if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
+		if (($rotation == 'bar') && ( ! ($grouping == 'percentStacked'))) {
 			$seriesPlots = array_reverse($seriesPlots);
 		}
 
@@ -409,7 +409,7 @@ 
 	}	//	function _renderPlotBar()
 
 
-	private function _renderPlotScatter($groupID,$bubble) {
+	private function _renderPlotScatter($groupID, $bubble) {
 		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
@@ -417,34 +417,34 @@ 
 		$seriesPlots = array();
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesY as $k => $dataValueY) {
+			foreach ($dataValuesY as $k => $dataValueY) {
 				$dataValuesY[$k] = $k;
 			}
 
-			$seriesPlot = new ScatterPlot($dataValuesX,$dataValuesY);
+			$seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
 			if ($scatterStyle == 'lineMarker') {
 				$seriesPlot->SetLinkPoints();
 				$seriesPlot->link->SetColor(self::$_colourSet[self::$_plotColour]);
 			} elseif ($scatterStyle == 'smoothMarker') {
-				$spline = new Spline($dataValuesY,$dataValuesX);
-				list($splineDataY,$splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
-				$lplot = new LinePlot($splineDataX,$splineDataY);
+				$spline = new Spline($dataValuesY, $dataValuesX);
+				list($splineDataY, $splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
+				$lplot = new LinePlot($splineDataX, $splineDataY);
 				$lplot->SetColor(self::$_colourSet[self::$_plotColour]);
 
 				$this->_graph->Add($lplot);
 			}
 
 			if ($bubble) {
-				$this->_formatPointMarker($seriesPlot,'dot');
+				$this->_formatPointMarker($seriesPlot, 'dot');
 				$seriesPlot->mark->SetColor('black');
 				$seriesPlot->mark->SetSize($bubbleSize);
 			} else {
 				$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-				$this->_formatPointMarker($seriesPlot,$marker);
+				$this->_formatPointMarker($seriesPlot, $marker);
 			}
 			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
 			$seriesPlot->SetLegend($dataLabel);
@@ -461,14 +461,14 @@ 
 		$seriesPlots = array();
 
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
 
 			$dataValues = array();
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValues[$k] = implode(' ',array_reverse($dataValueY));
+			foreach ($dataValuesY as $k => $dataValueY) {
+				$dataValues[$k] = implode(' ', array_reverse($dataValueY));
 			}
 			$tmp = array_shift($dataValues);
 			$dataValues[] = $tmp;
@@ -484,7 +484,7 @@ 
 			if ($radarStyle == 'filled') {
 				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour]);
 			}
-			$this->_formatPointMarker($seriesPlot,$marker);
+			$this->_formatPointMarker($seriesPlot, $marker);
 			$seriesPlot->SetLegend($dataLabel);
 
 			$this->_graph->Add($seriesPlot);
@@ -500,7 +500,7 @@ 
 
 		$dataValues = array();
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
@@ -519,11 +519,11 @@ 
 
 		$dataValues = array();
 		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
+		for ($i = 0; $i < $seriesCount; ++$i) {
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesX as $j => $dataValueX)
+			foreach ($dataValuesX as $j => $dataValueX)
 			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
 		}
 
@@ -538,8 +538,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,True,False,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i, True, False, $dimensions);
 		}
 	}	//	function _renderAreaChart()
 
@@ -549,8 +549,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,False,False,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i, False, False, $dimensions);
 		}
 	}	//	function _renderLineChart()
 
@@ -560,8 +560,8 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotBar($i,$dimensions);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotBar($i, $dimensions);
 		}
 	}	//	function _renderBarChart()
 
@@ -573,8 +573,8 @@ 
 
 		$this->_renderCartesianPlotArea('linlin');
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,false);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i, false);
 		}
 	}	//	function _renderScatterChart()
 
@@ -584,8 +584,8 @@ 
 
 		$this->_renderCartesianPlotArea('linlin');
 
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,true);
+		for ($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i, true);
 		}
 	}	//	function _renderBubbleChart()
 
@@ -599,13 +599,13 @@ 
 		$this->_renderPiePlotArea($doughnut);
 
 		$iLimit = ($multiplePlots) ? $groupCount : 1;
-		for($i = 0; $i < $iLimit; ++$i) {
+		for ($i = 0; $i < $iLimit; ++$i) {
 			$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotGrouping();
 			$exploded = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotStyle();
 			if ($i == 0) {
 				$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotCategoryByIndex(0)->getDataValues();
 				if (count($datasetLabels) > 0) {
-					$datasetLabels = $this->_formatDataSetLabels($i,$datasetLabels);
+					$datasetLabels = $this->_formatDataSetLabels($i, $datasetLabels);
 				}
 			}
 
@@ -614,13 +614,13 @@ 
 			//	For pie charts, we only display the first series: doughnut charts generally display all series
 			$jLimit = ($multiplePlots) ? $seriesCount : 1;
 			//	Loop through each data series in turn
-			for($j = 0; $j < $jLimit; ++$j) {
+			for ($j = 0; $j < $jLimit; ++$j) {
 				$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotValuesByIndex($j)->getDataValues();
 
 				//	Fill in any missing values in the $dataValues array
 				$testCurrentIndex = 0;
-				foreach($dataValues as $k => $dataValue) {
-					while($k != $testCurrentIndex) {
+				foreach ($dataValues as $k => $dataValue) {
+					while ($k != $testCurrentIndex) {
 						$dataValues[$testCurrentIndex] = null;
 						++$testCurrentIndex;
 					}
@@ -638,7 +638,7 @@ 
 				}
 
 				if ($multiplePlots) {
-					$seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+					$seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
 				}
 
 				if ($doughnut) {
@@ -646,7 +646,7 @@ 
 				}
 
 				$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-				$seriesPlot->SetLabels(array_fill(0,count($datasetLabels),''));
+				$seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
 				if ($dimensions != '3d') {
 					$seriesPlot->SetGuideLines(false);
 				}
@@ -668,7 +668,7 @@ 
 
 		$this->_renderRadarPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotRadar($i);
 		}
 	}	//	function _renderRadarChart()
@@ -679,24 +679,24 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotStock($i);
 		}
 	}	//	function _renderStockChart()
 
 
-	private function _renderContourChart($groupCount,$dimensions) {
+	private function _renderContourChart($groupCount, $dimensions) {
 		require_once('jpgraph_contour.php');
 
 		$this->_renderCartesianPlotArea('intint');
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$this->_renderPlotContour($i);
 		}
 	}	//	function _renderContourChart()
 
 
-	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
+	private function _renderCombinationChart($groupCount, $dimensions, $outputDestination) {
 		require_once('jpgraph_line.php');
 		require_once('jpgraph_bar.php');
 		require_once('jpgraph_scatter.php');
@@ -705,30 +705,30 @@ 
 
 		$this->_renderCartesianPlotArea();
 
-		for($i = 0; $i < $groupCount; ++$i) {
+		for ($i = 0; $i < $groupCount; ++$i) {
 			$dimensions = null;
 			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
 			switch ($chartType) {
 				case 'area3DChart' :
 					$dimensions = '3d';
 				case 'areaChart' :
-					$this->_renderPlotLine($i,True,True,$dimensions);
+					$this->_renderPlotLine($i, True, True, $dimensions);
 					break;
 				case 'bar3DChart' :
 					$dimensions = '3d';
 				case 'barChart' :
-					$this->_renderPlotBar($i,$dimensions);
+					$this->_renderPlotBar($i, $dimensions);
 					break;
 				case 'line3DChart' :
 					$dimensions = '3d';
 				case 'lineChart' :
-					$this->_renderPlotLine($i,False,True,$dimensions);
+					$this->_renderPlotLine($i, False, True, $dimensions);
 					break;
 				case 'scatterChart' :
-					$this->_renderPlotScatter($i,false);
+					$this->_renderPlotScatter($i, false);
 					break;
 				case 'bubbleChart' :
-					$this->_renderPlotScatter($i,true);
+					$this->_renderPlotScatter($i, true);
 					break;
 				default	:
 					$this->_graph = null;
@@ -751,7 +751,7 @@ 
 			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
 		} else {
 			$chartTypes = array();
-			for($i = 0; $i < $groupCount; ++$i) {
+			for ($i = 0; $i < $groupCount; ++$i) {
 				$chartTypes[] = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
 			}
 			$chartTypes = array_unique($chartTypes);
@@ -761,7 +761,7 @@ 
 				echo 'Chart is not yet implemented<br />';
 				return false;
 			} else {
-				return $this->_renderCombinationChart($groupCount,$dimensions,$outputDestination);
+				return $this->_renderCombinationChart($groupCount, $dimensions, $outputDestination);
 			}
 		}
 
@@ -769,27 +769,27 @@ 
 			case 'area3DChart' :
 				$dimensions = '3d';
 			case 'areaChart' :
-				$this->_renderAreaChart($groupCount,$dimensions);
+				$this->_renderAreaChart($groupCount, $dimensions);
 				break;
 			case 'bar3DChart' :
 				$dimensions = '3d';
 			case 'barChart' :
-				$this->_renderBarChart($groupCount,$dimensions);
+				$this->_renderBarChart($groupCount, $dimensions);
 				break;
 			case 'line3DChart' :
 				$dimensions = '3d';
 			case 'lineChart' :
-				$this->_renderLineChart($groupCount,$dimensions);
+				$this->_renderLineChart($groupCount, $dimensions);
 				break;
 			case 'pie3DChart' :
 				$dimensions = '3d';
 			case 'pieChart' :
-				$this->_renderPieChart($groupCount,$dimensions,False,False);
+				$this->_renderPieChart($groupCount, $dimensions, False, False);
 				break;
 			case 'doughnut3DChart' :
 				$dimensions = '3d';
 			case 'doughnutChart' :
-				$this->_renderPieChart($groupCount,$dimensions,True,True);
+				$this->_renderPieChart($groupCount, $dimensions, True, True);
 				break;
 			case 'scatterChart' :
 				$this->_renderScatterChart($groupCount);
@@ -803,10 +803,10 @@ 
 			case 'surface3DChart' :
 				$dimensions = '3d';
 			case 'surfaceChart' :
-				$this->_renderContourChart($groupCount,$dimensions);
+				$this->_renderContourChart($groupCount, $dimensions);
 				break;
 			case 'stockChart' :
-				$this->_renderStockChart($groupCount,$dimensions);
+				$this->_renderStockChart($groupCount, $dimensions);
 				break;
 			default	:
 				echo $chartType.' is not yet implemented<br />';

Braces +3 added lines, -2 removed lines

@@ -523,8 +523,9 @@
 			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
 			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
-			foreach($dataValuesX as $j => $dataValueX)
-			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
+			foreach($dataValuesX as $j => $dataValueX) {
+						$dataValues[$j][$plotOrder[$i]] = $dataValueX;
+			}
 		}
 
 		$seriesPlot = new StockPlot($dataValues);

app/Vendor/PHPExcel/PHPExcel/IOFactory.php

Doc Comments +3 added lines, -3 removed lines

@@ -184,7 +184,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	PHPExcel
 	 * @throws	Exception
 	 */
@@ -198,7 +198,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	string
 	 * @throws	Exception
 	 */
@@ -215,7 +215,7 @@ 
 	 *
 	 * @static
 	 * @access	public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return	PHPExcel_Reader_IReader
 	 * @throws	Exception
 	 */

Indentation +9 added lines, -9 removed lines

@@ -73,18 +73,18 @@
 		'CSV',
 	);
 
-    /**
-     *	Private constructor for PHPExcel_IOFactory
-     */
-    private function __construct() { }
+	/**
+	 *	Private constructor for PHPExcel_IOFactory
+	 */
+	private function __construct() { }
 
-    /**
-     * Get search locations
-     *
+	/**
+	 * Get search locations
+	 *
 	 * @static
 	 * @access	public
-     * @return	array
-     */
+	 * @return	array
+	 */
 	public static function getSearchLocations() {
 		return self::$_searchLocations;
 	}	//	function getSearchLocations()

Spacing +7 added lines, -7 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /**	PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -52,8 +52,8 @@ 
 	 * @static
 	 */
 	private static $_searchLocations = array(
-		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
-		array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
+		array('type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}'),
+		array('type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}')
 	);
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
 	 */
 	public static function addSearchLocation($type = '', $location = '', $classname = '') {
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+		self::$_searchLocations[] = array('type' => $type, 'path' => $location, 'class' => $classname);
 	}	//	function addSearchLocation()
 
 	/**
@@ -205,7 +205,7 @@ 
 	public static function identify($pFilename) {
 		$reader = self::createReaderForFile($pFilename);
 		$className = get_class($reader);
-		$classType = explode('_',$className);
+		$classType = explode('_', $className);
 		unset($reader);
 		return array_pop($classType);
 	}	//	function identify()

app/Vendor/PHPExcel/PHPExcel/Reader/CSV.php

Doc Comments +2 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @access	public
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return boolean
 	 * @throws Exception
 	 */
@@ -479,7 +479,6 @@ 
 	 * Set Contiguous
 	 *
 	 * @access	public
-	 * @param string $pValue Input encoding
 	 */
 	public function setContiguous($contiguous = false)
 	{
@@ -496,7 +495,7 @@ 
 	 * Get Contiguous
 	 *
 	 * @access	public
-	 * @return boolean
+	 * @return integer
 	 */
 	public function getContiguous() {
 		return $this->_contiguous;

Spacing +28 added lines, -28 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -50,7 +50,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_inputEncoding	= 'UTF-8';
+	private $_inputEncoding = 'UTF-8';
 
 	/**
 	 * Delimiter
@@ -58,7 +58,7 @@ 
 	 * @access	private
 	 * @var string
 	 */
-	private $_delimiter		= ',';
+	private $_delimiter = ',';
 
 	/**
 	 * Enclosure
@@ -66,7 +66,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_enclosure		= '"';
+	private $_enclosure = '"';
 
 	/**
 	 * Line ending
@@ -74,7 +74,7 @@ 
 	 * @access	private
 	 * @var	string
 	 */
-	private $_lineEnding	= PHP_EOL;
+	private $_lineEnding = PHP_EOL;
 
 	/**
 	 * Sheet index to read
@@ -82,7 +82,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_sheetIndex	= 0;
+	private $_sheetIndex = 0;
 
 	/**
 	 * Load rows contiguously
@@ -90,7 +90,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_contiguous	= false;
+	private $_contiguous = false;
 
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @access	private
 	 * @var	int
 	 */
-	private $_contiguousRow	= -1;
+	private $_contiguousRow = -1;
 
 	/**
 	 * PHPExcel_Reader_IReadFilter instance
@@ -114,7 +114,7 @@ 
 	 * Create a new PHPExcel_Reader_CSV
 	 */
 	public function __construct() {
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}	//	function __construct()
 
 
@@ -129,8 +129,8 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		return true;
@@ -195,14 +195,14 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Open file
 		$fileHandle = fopen($pFilename, 'r');
 		if ($fileHandle === false) {
-			throw new Exception("Could not open file " . $pFilename . " for reading.");
+			throw new Exception("Could not open file ".$pFilename." for reading.");
 		}
 
 		// Skip BOM, if any
@@ -231,7 +231,7 @@ 
 				break;
 		}
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
+		$escapeEnclosures = array("\\".$this->_enclosure, $this->_enclosure.$this->_enclosure);
 
 		$worksheetInfo = array();
 		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
@@ -286,15 +286,15 @@ 
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Create new PHPExcel
 		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
 			$objPHPExcel->createSheet();
 		}
-		$sheet = $objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+		$sheet = $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
 
 		$lineEnding = ini_get('auto_detect_line_endings');
 		ini_set('auto_detect_line_endings', true);
@@ -331,20 +331,20 @@ 
 				break;
 		}
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
-								   $this->_enclosure . $this->_enclosure
+		$escapeEnclosures = array("\\".$this->_enclosure,
+								   $this->_enclosure.$this->_enclosure
 								 );
 
 		// Set our starting row based on whether we're in contiguous mode or not
 		$currentRow = 1;
 		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
+			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow() : $this->_contiguousRow;
 		}
 
 		// Loop through each line of the file in turn
 		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
 			$columnLetter = 'A';
-			foreach($rowData as $rowDatum) {
+			foreach ($rowData as $rowDatum) {
 				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
 					// Unescape enclosures
 					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
@@ -355,7 +355,7 @@ 
 					}
 
 					// Set cell value
-					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+					$sheet->getCell($columnLetter.$currentRow)->setValue($rowDatum);
 				}
 				++$columnLetter;
 			}
@@ -483,9 +483,9 @@ 
 	 */
 	public function setContiguous($contiguous = false)
 	{
-		$this->_contiguous = (bool)$contiguous;
-		if (!$contiguous) {
-			$this->_contiguousRow	= -1;
+		$this->_contiguous = (bool) $contiguous;
+		if ( ! $contiguous) {
+			$this->_contiguousRow = -1;
 		}
 
 		return $this;

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2003XML.php

Doc Comments +7 added lines, -1 removed lines

@@ -172,7 +172,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -342,6 +342,9 @@ 
 	}
 
 
+	/**
+	 * @param string $styleAttributeValue
+	 */
 	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
 		foreach($styleList as $style) {
@@ -887,6 +890,9 @@ 
 	}
 
 
+	/**
+	 * @param string $charset
+	 */
 	private static function _convertStringEncoding($string,$charset) {
 		if ($charset != 'UTF-8') {
 			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);

Spacing +98 added lines, -98 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -84,7 +84,7 @@ 
 	 * Create a new PHPExcel_Reader_Excel2003XML
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 	}
 
 
@@ -195,8 +195,8 @@ 
 			);
 
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Read sample data (first 2 KB will do)
@@ -205,7 +205,7 @@ 
 		fclose($fh);
 
 		$valid = true;
-		foreach($signature as $match) {
+		foreach ($signature as $match) {
 			// every part of the signature must be present
 			if (strpos($data, $match) === false) {
 				$valid = false;
@@ -214,7 +214,7 @@ 
 		}
 
 		//	Retrieve charset encoding
-		if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
+		if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
 			$this->_charSet = strtoupper($matches[1]);
 		}
 //		echo 'Character Set is ',$this->_charSet,'<br />';
@@ -232,11 +232,11 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		if ( ! $this->canRead($pFilename)) {
+			throw new Exception($pFilename." is an Invalid Spreadsheet file.");
 		}
 
 		$worksheetNames = array();
@@ -245,9 +245,9 @@ 
 		$namespaces = $xml->getNamespaces(true);
 
 		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'], $this->_charSet);
 		}
 
 		return $worksheetNames;
@@ -263,8 +263,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetInfo = array();
@@ -274,7 +274,7 @@ 
 
 		$worksheetID = 1;
 		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
 			$tmpInfo = array();
@@ -293,11 +293,11 @@ 
 			if (isset($worksheet->Table->Row)) {
 				$rowIndex = 0;
 
-				foreach($worksheet->Table->Row as $rowData) {
+				foreach ($worksheet->Table->Row as $rowData) {
 					$columnIndex = 0;
 					$rowHasData = false;
 
-					foreach($rowData->Cell as $cell) {
+					foreach ($rowData->Cell as $cell) {
 						if (isset($cell->Data)) {
 							$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
 							$rowHasData = true;
@@ -342,9 +342,9 @@ 
 	}
 
 
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+	private static function identifyFixedStyleValue($styleList, &$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
+		foreach ($styleList as $style) {
 			if ($styleAttributeValue == strtolower($style)) {
 				$styleAttributeValue = $style;
 				return true;
@@ -396,23 +396,23 @@ 
 	 */
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
+		$fromFormats = array('\-', '\ ');
+		$toFormats = array('-', ' ');
 
-		$underlineStyles = array (
+		$underlineStyles = array(
 				PHPExcel_Style_Font::UNDERLINE_NONE,
 				PHPExcel_Style_Font::UNDERLINE_DOUBLE,
 				PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
 				PHPExcel_Style_Font::UNDERLINE_SINGLE,
 				PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
 			);
-		$verticalAlignmentStyles = array (
+		$verticalAlignmentStyles = array(
 				PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
 				PHPExcel_Style_Alignment::VERTICAL_TOP,
 				PHPExcel_Style_Alignment::VERTICAL_CENTER,
 				PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
 			);
-		$horizontalAlignmentStyles = array (
+		$horizontalAlignmentStyles = array(
 				PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
 				PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
 				PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
@@ -426,12 +426,12 @@ 
 
 
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		if ( ! $this->canRead($pFilename)) {
+			throw new Exception($pFilename." is an Invalid Spreadsheet file.");
 		}
 
 		$xml = simplexml_load_file($pFilename);
@@ -439,52 +439,52 @@ 
 
 		$docProps = $objPHPExcel->getProperties();
 		if (isset($xml->DocumentProperties[0])) {
-			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+			foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
 				switch ($propertyName) {
 					case 'Title' :
-							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setTitle(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Subject' :
-							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setSubject(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Author' :
-							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCreator(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Created' :
 							$creationDate = strtotime($propertyValue);
 							$docProps->setCreated($creationDate);
 							break;
 					case 'LastAuthor' :
-							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'LastSaved' :
 							$lastSaveDate = strtotime($propertyValue);
 							$docProps->setModified($lastSaveDate);
 							break;
 					case 'Company' :
-							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCompany(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Category' :
-							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setCategory(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Manager' :
-							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setManager(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Keywords' :
-							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setKeywords(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 					case 'Description' :
-							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
+							$docProps->setDescription(self::_convertStringEncoding($propertyValue, $this->_charSet));
 							break;
 				}
 			}
 		}
 		if (isset($xml->CustomDocumentProperties)) {
-			foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+			foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
 				$propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
+				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', 'PHPExcel_Reader_Excel2003XML::_hex2str', $propertyName);
 				$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
-				switch((string) $propertyAttributes) {
+				switch ((string) $propertyAttributes) {
 					case 'string' :
 						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
 						$propertyValue = trim($propertyValue);
@@ -506,11 +506,11 @@ 
 						$propertyValue = strtotime(trim($propertyValue));
 						break;
 				}
-				$docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
+				$docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
 			}
 		}
 
-		foreach($xml->Styles[0] as $style) {
+		foreach ($xml->Styles[0] as $style) {
 			$style_ss = $style->attributes($namespaces['ss']);
 			$styleID = (string) $style_ss['ID'];
 //			echo 'Style ID = '.$styleID.'<br />';
@@ -524,17 +524,17 @@ 
 //				echo $styleType.'<br />';
 				switch ($styleType) {
 					case 'Alignment' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								$styleAttributeValue = (string) $styleAttributeValue;
 								switch ($styleAttributeKey) {
 									case 'Vertical' :
-											if (self::identifyFixedStyleValue($verticalAlignmentStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
 											}
 											break;
 									case 'Horizontal' :
-											if (self::identifyFixedStyleValue($horizontalAlignmentStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($horizontalAlignmentStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
 											}
 											break;
@@ -545,10 +545,10 @@ 
 							}
 							break;
 					case 'Borders' :
-							foreach($styleData->Border as $borderStyle) {
+							foreach ($styleData->Border as $borderStyle) {
 								$borderAttributes = $borderStyle->attributes($namespaces['ss']);
 								$thisBorder = array();
-								foreach($borderAttributes as $borderStyleKey => $borderStyleValue) {
+								foreach ($borderAttributes as $borderStyleKey => $borderStyleValue) {
 //									echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
 									switch ($borderStyleKey) {
 										case 'LineStyle' :
@@ -562,12 +562,12 @@ 
 												$borderPosition = strtolower($borderStyleValue);
 												break;
 										case 'Color' :
-												$borderColour = substr($borderStyleValue,1);
+												$borderColour = substr($borderStyleValue, 1);
 												$thisBorder['color']['rgb'] = $borderColour;
 												break;
 									}
 								}
-								if (!empty($thisBorder)) {
+								if ( ! empty($thisBorder)) {
 									if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
 										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
 									}
@@ -575,7 +575,7 @@ 
 							}
 							break;
 					case 'Font' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								$styleAttributeValue = (string) $styleAttributeValue;
 								switch ($styleAttributeKey) {
@@ -586,7 +586,7 @@ 
 											$this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
 											break;
 									case 'Color' :
-											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
+											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue, 1);
 											break;
 									case 'Bold' :
 											$this->_styles[$styleID]['font']['bold'] = true;
@@ -595,7 +595,7 @@ 
 											$this->_styles[$styleID]['font']['italic'] = true;
 											break;
 									case 'Underline' :
-											if (self::identifyFixedStyleValue($underlineStyles,$styleAttributeValue)) {
+											if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
 												$this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
 											}
 											break;
@@ -603,19 +603,19 @@ 
 							}
 							break;
 					case 'Interior' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 								switch ($styleAttributeKey) {
 									case 'Color' :
-											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
+											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
 											break;
 								}
 							}
 							break;
 					case 'NumberFormat' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = str_replace($fromFormats,$toFormats,$styleAttributeValue);
+								$styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
 								switch ($styleAttributeValue) {
 									case 'Short Date' :
 											$styleAttributeValue = 'dd/mm/yyyy';
@@ -627,7 +627,7 @@ 
 							}
 							break;
 					case 'Protection' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+							foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
 //								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
 							}
 							break;
@@ -641,11 +641,11 @@ 
 		$worksheetID = 0;
 		$xml_ss = $xml->children($namespaces['ss']);
 
-		foreach($xml_ss->Worksheet as $worksheet) {
+		foreach ($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
 			if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-				(!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
+				( ! in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
 				continue;
 			}
 
@@ -655,19 +655,19 @@ 
 			$objPHPExcel->createSheet();
 			$objPHPExcel->setActiveSheetIndex($worksheetID);
 			if (isset($worksheet_ss['Name'])) {
-				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'], $this->_charSet);
 				//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
 				//		formula cells... during the load, all formulae should be correct, and we're simply bringing
 				//		the worksheet name in line with the formula, not the reverse
-				$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+				$objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
 			}
 
 			$columnID = 'A';
 			if (isset($worksheet->Table->Column)) {
-				foreach($worksheet->Table->Column as $columnData) {
+				foreach ($worksheet->Table->Column as $columnData) {
 					$columnData_ss = $columnData->attributes($namespaces['ss']);
 					if (isset($columnData_ss['Index'])) {
-						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index'] - 1);
 					}
 					if (isset($columnData_ss['Width'])) {
 						$columnWidth = $columnData_ss['Width'];
@@ -680,7 +680,7 @@ 
 
 			$rowID = 1;
 			if (isset($worksheet->Table->Row)) {
-				foreach($worksheet->Table->Row as $rowData) {
+				foreach ($worksheet->Table->Row as $rowData) {
 					$rowHasData = false;
 					$row_ss = $rowData->attributes($namespaces['ss']);
 					if (isset($row_ss['Index'])) {
@@ -689,16 +689,16 @@ 
 //					echo '<b>Row '.$rowID.'</b><br />';
 
 					$columnID = 'A';
-					foreach($rowData->Cell as $cell) {
+					foreach ($rowData->Cell as $cell) {
 
 						$cell_ss = $cell->attributes($namespaces['ss']);
 						if (isset($cell_ss['Index'])) {
-							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
+							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index'] - 1);
 						}
 						$cellRange = $columnID.$rowID;
 
 						if ($this->getReadFilter() !== NULL) {
-							if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+							if ( ! $this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
 								continue;
 							}
 						}
@@ -706,7 +706,7 @@ 
 						if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
 							$columnTo = $columnID;
 							if (isset($cell_ss['MergeAcross'])) {
-								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] - 1);
 							}
 							$rowTo = $rowID;
 							if (isset($cell_ss['MergeDown'])) {
@@ -744,7 +744,7 @@ 
 									const TYPE_ERROR		= 'e';
 									*/
 									case 'String' :
-											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
+											$cellValue = self::_convertStringEncoding($cellValue, $this->_charSet);
 											$type = PHPExcel_Cell_DataType::TYPE_STRING;
 											break;
 									case 'Number' :
@@ -772,58 +772,58 @@ 
 //								echo 'FORMULA<br />';
 								$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
 								$columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
-								if (substr($cellDataFormula,0,3) == 'of:') {
-									$cellDataFormula = substr($cellDataFormula,3);
+								if (substr($cellDataFormula, 0, 3) == 'of:') {
+									$cellDataFormula = substr($cellDataFormula, 3);
 //									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
+									$temp = explode('"', $cellDataFormula);
 									$key = false;
-									foreach($temp as &$value) {
+									foreach ($temp as &$value) {
 										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											$value = str_replace(array('[.','.',']'),'',$value);
+										if ($key = ! $key) {
+											$value = str_replace(array('[.', '.', ']'), '', $value);
 										}
 									}
 								} else {
 									//	Convert R1C1 style references to A1 style references (but only when not quoted)
 //									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
+									$temp = explode('"', $cellDataFormula);
 									$key = false;
-									foreach($temp as &$value) {
+									foreach ($temp as &$value) {
 										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+										if ($key = ! $key) {
+											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
 											//		through the formula from left to right. Reversing means that we work right to left.through
 											//		the formula
 											$cellReferences = array_reverse($cellReferences);
 											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
 											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
+											foreach ($cellReferences as $cellReference) {
 												$rowReference = $cellReference[2][0];
 												//	Empty R reference is the current row
 												if ($rowReference == '') $rowReference = $rowID;
 												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference, '[]');
 												$columnReference = $cellReference[4][0];
 												//	Empty C reference is the current column
 												if ($columnReference == '') $columnReference = $columnNumber;
 												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
+												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference, '[]');
+												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference - 1).$rowReference;
+													$value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
 											}
 										}
 									}
 								}
 								unset($value);
 								//	Then rebuild the formula string
-								$cellDataFormula = implode('"',$temp);
+								$cellDataFormula = implode('"', $temp);
 //								echo 'After: ',$cellDataFormula,'<br />';
 							}
 
 //							echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
 //
-							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue),$type);
+							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
 							if ($hasCalculatedValue) {
 //								echo 'Formula result is '.$cellValue.'<br />';
 								$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
@@ -836,7 +836,7 @@ 
 							$commentAttributes = $cell->Comment->attributes($namespaces['ss']);
 							$author = 'unknown';
 							if (isset($commentAttributes->Author)) {
-								$author = (string)$commentAttributes->Author;
+								$author = (string) $commentAttributes->Author;
 //								echo 'Author: ',$author,'<br />';
 							}
 							$node = $cell->Comment->Data->asXML();
@@ -844,19 +844,19 @@ 
 //							echo $annotation,'<br />';
 							$annotation = strip_tags($node);
 //							echo 'Annotation: ',$annotation,'<br />';
-							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
-															->setText($this->_parseRichText($annotation) );
+							$objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)
+															->setAuthor(self::_convertStringEncoding($author, $this->_charSet))
+															->setText($this->_parseRichText($annotation));
 						}
 
 						if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
 							$style = (string) $cell_ss['StyleID'];
 //							echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
+							if ((isset($this->_styles[$style])) && ( ! empty($this->_styles[$style]))) {
 //								echo 'Cell '.$columnID.$rowID.'<br />';
 //								print_r($this->_styles[$style]);
 //								echo '<br />';
-								if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
+								if ( ! $objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
 									$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
 								}
 								$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
@@ -887,9 +887,9 @@ 
 	}
 
 
-	private static function _convertStringEncoding($string,$charset) {
+	private static function _convertStringEncoding($string, $charset) {
 		if ($charset != 'UTF-8') {
-			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
+			return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset);
 		}
 		return $string;
 	}
@@ -898,7 +898,7 @@ 
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
-		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
+		$value->createText(self::_convertStringEncoding($is, $this->_charSet));
 
 		return $value;
 	}

Braces +12 added lines, -4 removed lines

@@ -801,14 +801,22 @@
 											foreach($cellReferences as $cellReference) {
 												$rowReference = $cellReference[2][0];
 												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $rowID;
+												if ($rowReference == '') {
+													$rowReference = $rowID;
+												}
 												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+												if ($rowReference{0} == '[') {
+													$rowReference = $rowID + trim($rowReference,'[]');
+												}
 												$columnReference = $cellReference[4][0];
 												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $columnNumber;
+												if ($columnReference == '') {
+													$columnReference = $columnNumber;
+												}
 												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
+												if ($columnReference{0} == '[') {
+													$columnReference = $columnNumber + trim($columnReference,'[]');
+												}
 												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
 													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
 											}

Indentation +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
 	}
 
 
-    /**
+	/**
 	 * Loads PHPExcel from file
 	 *
 	 * @param 	string 		$pFilename

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2007.php

Doc Comments +15 added lines, -1 removed lines

@@ -224,7 +224,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -366,6 +366,11 @@ 
 	}	//	function _castToString()
 
 
+	/**
+	 * @param string $r
+	 * @param string $cellDataType
+	 * @param string $castBaseType
+	 */
 	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
 //		echo '<font color="darkgreen">Formula</font><br />';
 //		echo '$c->f is '.$c->f.'<br />';
@@ -415,6 +420,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
 	{
 		// Root-relative paths
@@ -1755,6 +1763,9 @@ 
 	}
 
 
+	/**
+	 * @param PHPExcel_Style $docStyle
+	 */
 	private static function _readStyle($docStyle, $style) {
 		// format code
 		if (isset($style->numFmt)) {
@@ -1966,6 +1977,9 @@ 
 	}
 
 
+	/**
+	 * @param string $style
+	 */
 	private static function toCSSArray($style) {
 		$style = str_replace(array("\r","\n"), "", $style);
 

Indentation +64 added lines, -64 removed lines

@@ -766,12 +766,12 @@ 
 							}
 
 							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
+								if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
+									$docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
 								}
 
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
+								if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
+									$docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
@@ -787,22 +787,22 @@ 
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
-								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
-								    } else {
-								        $xSplit = 0;
-								        $ySplit = 0;
-
-								        if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
-								            $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
-								        }
-
-								    	if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
-								            $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
-								        }
-
-								        $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
-								    }
+									if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
+										$docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
+									} else {
+										$xSplit = 0;
+										$ySplit = 0;
+
+										if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
+											$xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
+										}
+
+										if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
+											$ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
+										}
+
+										$docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
+									}
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
@@ -1193,8 +1193,8 @@ 
 
 							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
 								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
-								    // Uppercase coordinate
-							    	$range = strtoupper($dataValidation["sqref"]);
+									// Uppercase coordinate
+									$range = strtoupper($dataValidation["sqref"]);
 									$rangeSet = explode(' ',$range);
 									foreach($rangeSet as $range) {
 										$stRange = $docSheet->shrinkRangeToFit($range);
@@ -1267,10 +1267,10 @@ 
 								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
 									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
+										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
 											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
 										}
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
 											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
 										}
 									}
@@ -1298,7 +1298,7 @@ 
 								}
 
 								// Loop through VML comments
-							    foreach ($vmlComments as $relName => $relPath) {
+								foreach ($vmlComments as $relName => $relPath) {
 									// Load VML comments file
 									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
 									$vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
@@ -1309,42 +1309,42 @@ 
 										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
-	    									$column       = null;
-	    									$row          = null;
-
-	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
-
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
-	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
-
-	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
-	        									}
-	    									}
-
-	    									if (($column !== NULL) && ($row !== NULL)) {
-	    									    // Set comment properties
-	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
-
-	    									    // Parse style
-	    									    $styleArray = explode(';', str_replace(' ', '', $style));
-	    									    foreach ($styleArray as $stylePair) {
-	    									        $stylePair = explode(':', $stylePair);
-
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
-
-	    									    }
-	    									}
+											$style        = (string)$shape['style'];
+											$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
+											$column       = null;
+											$row          = null;
+
+											$clientData   = $shape->xpath('.//x:ClientData');
+											if (is_array($clientData) && !empty($clientData)) {
+												$clientData   = $clientData[0];
+
+												if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
+													$temp = $clientData->xpath('.//x:Row');
+													if (is_array($temp)) $row = $temp[0];
+
+													$temp = $clientData->xpath('.//x:Column');
+													if (is_array($temp)) $column = $temp[0];
+												}
+											}
+
+											if (($column !== NULL) && ($row !== NULL)) {
+												// Set comment properties
+												$comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
+												$comment->getFillColor()->setRGB( $fillColor );
+
+												// Parse style
+												$styleArray = explode(';', str_replace(' ', '', $style));
+												foreach ($styleArray as $stylePair) {
+													$stylePair = explode(':', $stylePair);
+
+													if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
+													if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
+													if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
+													if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
+													if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+
+												}
+											}
 										}
 									}
 								}
@@ -1919,12 +1919,12 @@ 
 					}
 
 					if ( (isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
-					     || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
+						 || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
 						$objText->getFont()->setBold(true);
 					}
 
 					if ( (isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
-					     || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
+						 || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
 						$objText->getFont()->setItalic(true);
 					}
 
@@ -1945,7 +1945,7 @@ 
 					}
 
 					if ( (isset($run->rPr->strike["val"])  && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
-					     || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
+						 || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
 						$objText->getFont()->setStrikethrough(true);
 					}
 				}

Spacing +242 added lines, -242 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -231,12 +231,12 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Check if zip class exists
-		if (!class_exists('ZipArchive')) {
+		if ( ! class_exists('ZipArchive')) {
 			throw new Exception("ZipArchive library is not enabled");
 		}
 
@@ -274,8 +274,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetInfo = array();
@@ -287,7 +287,7 @@ 
 		foreach ($rels->Relationship as $rel) {
 			if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
 				$dir = dirname($rel["Target"]);
-				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/".basename($rel["Target"]).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 				$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
 
 				$worksheets = array();
@@ -297,7 +297,7 @@ 
 					}
 				}
 
-				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 				if ($xmlWorkbook->sheets) {
 					$dir = dirname($rel["Target"]);
 					foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
@@ -309,7 +309,7 @@ 
 						$tmpInfo['totalColumns'] = 0;
 
 						$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 						if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
 							foreach ($xmlSheet->sheetData->row as $row) {
 								foreach ($row->c as $c) {
@@ -348,7 +348,7 @@ 
 		} elseif ($value == '1') {
 			return true;
 		} else {
-			return (bool)$c->v;
+			return (bool) $c->v;
 		}
 		return $value;
 	}	//	function _castToBool()
@@ -356,38 +356,38 @@ 
 
 	private static function _castToError($c) {
 //		echo 'Initial Cast to Error<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : null; ;
 	}	//	function _castToError()
 
 
 	private static function _castToString($c) {
 //		echo 'Initial Cast to String<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : null; ;
 	}	//	function _castToString()
 
 
-	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
+	private function _castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType) {
 //		echo '<font color="darkgreen">Formula</font><br />';
 //		echo '$c->f is '.$c->f.'<br />';
-		$cellDataType 		= 'f';
-		$value 				= "={$c->f}";
-		$calculatedValue 	= self::$castBaseType($c);
+		$cellDataType = 'f';
+		$value = "={$c->f}";
+		$calculatedValue = self::$castBaseType($c);
 
 		// Shared formula?
-		if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
+		if (isset($c->f['t']) && strtolower((string) $c->f['t']) == 'shared') {
 //			echo '<font color="darkgreen">SHARED FORMULA</font><br />';
-			$instance = (string)$c->f['si'];
+			$instance = (string) $c->f['si'];
 
 //			echo 'Instance ID = '.$instance.'<br />';
 //
 //			echo 'Shared Formula Array:<pre>';
 //			print_r($sharedFormulas);
 //			echo '</pre>';
-			if (!isset($sharedFormulas[(string)$c->f['si']])) {
+			if ( ! isset($sharedFormulas[(string) $c->f['si']])) {
 //				echo '<font color="darkgreen">SETTING NEW SHARED FORMULA</font><br />';
 //				echo 'Master is '.$r.'<br />';
 //				echo 'Formula is '.$value.'<br />';
-				$sharedFormulas[$instance] = array(	'master' => $r,
+				$sharedFormulas[$instance] = array('master' => $r,
 													'formula' => $value
 												  );
 //				echo 'New Shared Formula Array:<pre>';
@@ -404,7 +404,7 @@ 
 				$difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
 				$difference[1] = $current[1] - $master[1];
 
-				$value = $this->_referenceHelper->updateFormulaReferences(	$sharedFormulas[$instance]['formula'],
+				$value = $this->_referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'],
 																			'A1',
 																			$difference[0],
 																			$difference[1]
@@ -444,8 +444,8 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetNames = array();
@@ -457,7 +457,7 @@ 
 		foreach ($rels->Relationship as $rel) {
 			switch ($rel["Type"]) {
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 					if ($xmlWorkbook->sheets) {
 						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
@@ -483,14 +483,14 @@ 
 	public function load($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Initialisations
 		$excel = new PHPExcel;
 		$excel->removeSheetByIndex(0);
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$excel->removeCellStyleXfByIndex(0); // remove the default style
 			$excel->removeCellXfByIndex(0); // remove the default style
 		}
@@ -502,22 +502,22 @@ 
 		foreach ($wbRels->Relationship as $rel) {
 			switch ($rel["Type"]) {
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
-					$themeOrderArray = array('lt1','dk1','lt2','dk2');
+					$themeOrderArray = array('lt1', 'dk1', 'lt2', 'dk2');
 					$themeOrderAdditional = count($themeOrderArray);
 
 					$xmlTheme = simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"));
 					if (is_object($xmlTheme)) {
 						$xmlThemeName = $xmlTheme->attributes();
 						$xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-						$themeName = (string)$xmlThemeName['name'];
+						$themeName = (string) $xmlThemeName['name'];
 
 						$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-						$colourSchemeName = (string)$colourScheme['name'];
+						$colourSchemeName = (string) $colourScheme['name'];
 						$colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
 
 						$themeColours = array();
 						foreach ($colourScheme as $k => $xmlColour) {
-							$themePos = array_search($k,$themeOrderArray);
+							$themePos = array_search($k, $themeOrderArray);
 							if ($themePos === false) {
 								$themePos = $themeOrderAdditional++;
 							}
@@ -529,7 +529,7 @@ 
 								$themeColours[$themePos] = $xmlColourData['val'];
 							}
 						}
-						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName,$colourSchemeName,$themeColours);
+						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName, $colourSchemeName, $themeColours);
 					}
 					break;
 			}
@@ -579,9 +579,9 @@ 
 								$cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
 								$attributeType = $cellDataOfficeChildren->getName();
 								$attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
-								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue,$attributeType);
+								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue, $attributeType);
 								$attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
-								$docProps->setCustomProperty($propertyName,$attributeValue,$attributeType);
+								$docProps->setCustomProperty($propertyName, $attributeValue, $attributeType);
 							}
 						}
 					}
@@ -589,16 +589,16 @@ 
 
 				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
 					$dir = dirname($rel["Target"]);
-					$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+					$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/".basename($rel["Target"]).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 					$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
 
 					$sharedStrings = array();
 					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
-					$xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 					if (isset($xmlStrings) && isset($xmlStrings->si)) {
 						foreach ($xmlStrings->si as $val) {
 							if (isset($val->t)) {
-								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $val->t );
+								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $val->t);
 							} elseif (isset($val->r)) {
 								$sharedStrings[] = $this->_parseRichText($val);
 							}
@@ -612,7 +612,7 @@ 
 						}
 					}
 
-					$styles 	= array();
+					$styles = array();
 					$cellStyles = array();
 					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
 					$xmlStyles = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
@@ -623,7 +623,7 @@ 
 					if (isset($numFmts) && ($numFmts !== NULL)) {
 						$numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 					}
-					if (!$this->_readDataOnly && $xmlStyles) {
+					if ( ! $this->_readDataOnly && $xmlStyles) {
 						foreach ($xmlStyles->cellXfs->xf as $xf) {
 							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
 
@@ -636,8 +636,8 @@ 
 									}
 								}
 
-								if ((int)$xf["numFmtId"] < 164) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+								if ((int) $xf["numFmtId"] < 164) {
+									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
 								}
 							}
 							//$numFmt = str_replace('mm', 'i', $numFmt);
@@ -665,8 +665,8 @@ 
 								$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
 								if (isset($tmpNumFmt["formatCode"])) {
 									$numFmt = (string) $tmpNumFmt["formatCode"];
-								} else if ((int)$xf["numFmtId"] < 165) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+								} else if ((int) $xf["numFmtId"] < 165) {
+									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
 								}
 							}
 
@@ -688,7 +688,7 @@ 
 					}
 
 					$dxfs = array();
-					if (!$this->_readDataOnly && $xmlStyles) {
+					if ( ! $this->_readDataOnly && $xmlStyles) {
 						if ($xmlStyles->dxfs) {
 							foreach ($xmlStyles->dxfs->dxf as $dxf) {
 								$style = new PHPExcel_Style;
@@ -713,13 +713,13 @@ 
 						}
 					}
 
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 					// Set base date
 					if ($xmlWorkbook->workbookPr) {
 						PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
 						if (isset($xmlWorkbook->workbookPr['date1904'])) {
-							$date1904 = (string)$xmlWorkbook->workbookPr['date1904'];
+							$date1904 = (string) $xmlWorkbook->workbookPr['date1904'];
 							if ($date1904 == "true" || $date1904 == "1") {
 								PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
 							}
@@ -739,7 +739,7 @@ 
 							++$oldSheetId;
 
 							// Check if sheet should be skipped
-							if (isset($this->_loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
+							if (isset($this->_loadSheetsOnly) && ! in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
 								++$countSkippedSheets;
 								$mapSheetId[$oldSheetId] = null;
 								continue;
@@ -755,40 +755,40 @@ 
 							//		references in formula cells... during the load, all formulae should be correct,
 							//		and we're simply bringing the worksheet name in line with the formula, not the
 							//		reverse
-							$docSheet->setTitle((string) $eleSheet["name"],false);
+							$docSheet->setTitle((string) $eleSheet["name"], false);
 							$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
 							$sharedFormulas = array();
 
 							if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
-								$docSheet->setSheetState( (string) $eleSheet["state"] );
+								$docSheet->setSheetState((string) $eleSheet["state"]);
 							}
 
 							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
 							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
+								    $docSheet->getSheetView()->setZoomScale(intval($xmlSheet->sheetViews->sheetView['zoomScale']));
 								}
 
 							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
+								    $docSheet->getSheetView()->setZoomScaleNormal(intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']));
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
-									$docSheet->setShowGridLines((string)$xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
+									$docSheet->setShowGridLines((string) $xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
-									$docSheet->setShowRowColHeaders((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders'] ? true : false);
+									$docSheet->setShowRowColHeaders((string) $xmlSheet->sheetViews->sheetView['showRowColHeaders'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
-									$docSheet->setRightToLeft((string)$xmlSheet->sheetViews->sheetView['rightToLeft'] ? true : false);
+									$docSheet->setRightToLeft((string) $xmlSheet->sheetViews->sheetView['rightToLeft'] ? true : false);
 								}
 
 								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
 								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
+								        $docSheet->freezePane((string) $xmlSheet->sheetViews->sheetView->pane['topLeftCell']);
 								    } else {
 								        $xSplit = 0;
 								        $ySplit = 0;
@@ -807,7 +807,7 @@ 
 
 								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
 									if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
-										$sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
+										$sqref = (string) $xmlSheet->sheetViews->sheetView->selection['sqref'];
 										$sqref = explode(' ', $sqref);
 										$sqref = $sqref[0];
 										$docSheet->setSelectedCells($sqref);
@@ -818,7 +818,7 @@ 
 
 							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
 								if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
-									$docSheet->getTabColor()->setARGB( (string)$xmlSheet->sheetPr->tabColor['rgb'] );
+									$docSheet->getTabColor()->setARGB((string) $xmlSheet->sheetPr->tabColor['rgb']);
 								}
 							}
 
@@ -845,18 +845,18 @@ 
 							}
 
 							if (isset($xmlSheet->sheetFormatPr)) {
-								if (isset($xmlSheet->sheetFormatPr['customHeight']) && ((string)$xmlSheet->sheetFormatPr['customHeight'] == '1' || strtolower((string)$xmlSheet->sheetFormatPr['customHeight']) == 'true') && isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
-									$docSheet->getDefaultRowDimension()->setRowHeight( (float)$xmlSheet->sheetFormatPr['defaultRowHeight'] );
+								if (isset($xmlSheet->sheetFormatPr['customHeight']) && ((string) $xmlSheet->sheetFormatPr['customHeight'] == '1' || strtolower((string) $xmlSheet->sheetFormatPr['customHeight']) == 'true') && isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
+									$docSheet->getDefaultRowDimension()->setRowHeight((float) $xmlSheet->sheetFormatPr['defaultRowHeight']);
 								}
 								if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
-									$docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
+									$docSheet->getDefaultColumnDimension()->setWidth((float) $xmlSheet->sheetFormatPr['defaultColWidth']);
 								}
 							}
 
-							if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
+							if (isset($xmlSheet->cols) && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->cols->col as $col) {
 									for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
-										if ($col["style"] && !$this->_readDataOnly) {
+										if ($col["style"] && ! $this->_readDataOnly) {
 											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
 										}
 										if ($col["bestFit"]) {
@@ -880,7 +880,7 @@ 
 								}
 							}
 
-							if (isset($xmlSheet->printOptions) && !$this->_readDataOnly) {
+							if (isset($xmlSheet->printOptions) && ! $this->_readDataOnly) {
 								if ($xmlSheet->printOptions['gridLinesSet'] == 'true' && $xmlSheet->printOptions['gridLinesSet'] == '1') {
 									$docSheet->setShowGridlines(true);
 								}
@@ -899,10 +899,10 @@ 
 
 							if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
 								foreach ($xmlSheet->sheetData->row as $row) {
-									if ($row["ht"] && !$this->_readDataOnly) {
+									if ($row["ht"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
 									}
-									if ($row["hidden"] && !$this->_readDataOnly) {
+									if ($row["hidden"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setVisible(false);
 									}
 									if ($row["collapsed"]) {
@@ -911,21 +911,21 @@ 
 									if ($row["outlineLevel"] > 0) {
 										$docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
 									}
-									if ($row["s"] && !$this->_readDataOnly) {
+									if ($row["s"] && ! $this->_readDataOnly) {
 										$docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
 									}
 
 									foreach ($row->c as $c) {
-										$r 					= (string) $c["r"];
-										$cellDataType 		= (string) $c["t"];
-										$value				= null;
-										$calculatedValue 	= null;
+										$r = (string) $c["r"];
+										$cellDataType = (string) $c["t"];
+										$value = null;
+										$calculatedValue = null;
 
 										// Read cell?
 										if ($this->getReadFilter() !== NULL) {
 											$coordinates = PHPExcel_Cell::coordinateFromString($r);
 
-											if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
+											if ( ! $this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
 												continue;
 											}
 										}
@@ -939,7 +939,7 @@ 
 										switch ($cellDataType) {
 											case "s":
 	//											echo 'String<br />';
-												if ((string)$c->v != '') {
+												if ((string) $c->v != '') {
 													$value = $sharedStrings[intval($c->v)];
 
 													if ($value instanceof PHPExcel_RichText) {
@@ -952,11 +952,11 @@ 
 												break;
 											case "b":
 	//											echo 'Boolean<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 													$value = self::_castToBool($c);
 												} else {
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToBool');
 													if (isset($c->f['t'])) {
 														$att = array();
 														$att = $c->f;
@@ -972,11 +972,11 @@ 
 												break;
 											case "e":
 	//											echo 'Error<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 													$value = self::_castToError($c);
 												} else {
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToError');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToError');
 	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
 												}
 
@@ -984,13 +984,13 @@ 
 
 											default:
 	//											echo 'Default<br />';
-												if (!isset($c->f)) {
+												if ( ! isset($c->f)) {
 	//												echo 'Not a Formula<br />';
 													$value = self::_castToString($c);
 												} else {
 	//												echo 'Treat as Formula<br />';
 													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToString');
+													$this->_castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, '_castToString');
 	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
 												}
 
@@ -1000,9 +1000,9 @@ 
 
 										// Check for numeric values
 										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
+											if ($value == (int) $value) $value = (int) $value;
+											elseif ($value == (float) $value) $value = (float) $value;
+											elseif ($value == (double) $value) $value = (double) $value;
 										}
 
 										// Rich text?
@@ -1022,7 +1022,7 @@ 
 										}
 
 										// Style information?
-										if ($c["s"] && !$this->_readDataOnly) {
+										if ($c["s"] && ! $this->_readDataOnly) {
 											// no style index means 0, it seems
 											$cell->setXfIndex(isset($styles[intval($c["s"])]) ?
 												intval($c["s"]) : 0);
@@ -1032,15 +1032,15 @@ 
 							}
 
 							$conditionals = array();
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
 								foreach ($xmlSheet->conditionalFormatting as $conditional) {
 									foreach ($conditional->cfRule as $cfRule) {
 										if (
 											(
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
+												(string) $cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
 											) && isset($dxfs[intval($cfRule["dxfId"])])
 										) {
 											$conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
@@ -1053,19 +1053,19 @@ 
 									$conditionalStyles = array();
 									foreach ($cfRules as $cfRule) {
 										$objConditional = new PHPExcel_Style_Conditional();
-										$objConditional->setConditionType((string)$cfRule["type"]);
-										$objConditional->setOperatorType((string)$cfRule["operator"]);
+										$objConditional->setConditionType((string) $cfRule["type"]);
+										$objConditional->setOperatorType((string) $cfRule["operator"]);
 
-										if ((string)$cfRule["text"] != '') {
-											$objConditional->setText((string)$cfRule["text"]);
+										if ((string) $cfRule["text"] != '') {
+											$objConditional->setText((string) $cfRule["text"]);
 										}
 
 										if (count($cfRule->formula) > 1) {
 											foreach ($cfRule->formula as $formula) {
-												$objConditional->addCondition((string)$formula);
+												$objConditional->addCondition((string) $formula);
 											}
 										} else {
-											$objConditional->addCondition((string)$cfRule->formula);
+											$objConditional->addCondition((string) $cfRule->formula);
 										}
 										$objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
 										$conditionalStyles[] = $objConditional;
@@ -1080,14 +1080,14 @@ 
 							}
 
 							$aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
 								foreach ($aKeys as $key) {
-									$method = "set" . ucfirst($key);
+									$method = "set".ucfirst($key);
 									$docSheet->getProtection()->$method($xmlSheet->sheetProtection[$key] == "true");
 								}
 							}
 
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+							if ( ! $this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
 								$docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], true);
 								if ($xmlSheet->protectedRanges->protectedRange) {
 									foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
@@ -1096,17 +1096,17 @@ 
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->autoFilter && ! $this->_readDataOnly) {
 								$docSheet->setAutoFilter((string) $xmlSheet->autoFilter["ref"]);
 							}
 
-							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
 									$docSheet->mergeCells((string) $mergeCell["ref"]);
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->pageMargins && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->pageMargins && ! $this->_readDataOnly) {
 								$docPageMargins = $docSheet->getPageMargins();
 								$docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
 								$docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
@@ -1116,7 +1116,7 @@ 
 								$docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
 							}
 
-							if ($xmlSheet && $xmlSheet->pageSetup && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->pageSetup && ! $this->_readDataOnly) {
 								$docPageSetup = $docSheet->getPageSetup();
 
 								if (isset($xmlSheet->pageSetup["orientation"])) {
@@ -1135,34 +1135,34 @@ 
 									$docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), false);
 								}
 								if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
-									((string)$xmlSheet->pageSetup["useFirstPageNumber"] == 'true' || (string)$xmlSheet->pageSetup["useFirstPageNumber"] == '1')) {
+									((string) $xmlSheet->pageSetup["useFirstPageNumber"] == 'true' || (string) $xmlSheet->pageSetup["useFirstPageNumber"] == '1')) {
 									$docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->headerFooter && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->headerFooter && ! $this->_readDataOnly) {
 								$docHeaderFooter = $docSheet->getHeaderFooter();
 
 								if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
-									((string)$xmlSheet->headerFooter["differentOddEven"] == 'true' || (string)$xmlSheet->headerFooter["differentOddEven"] == '1')) {
+									((string) $xmlSheet->headerFooter["differentOddEven"] == 'true' || (string) $xmlSheet->headerFooter["differentOddEven"] == '1')) {
 									$docHeaderFooter->setDifferentOddEven(true);
 								} else {
 									$docHeaderFooter->setDifferentOddEven(false);
 								}
 								if (isset($xmlSheet->headerFooter["differentFirst"]) &&
-									((string)$xmlSheet->headerFooter["differentFirst"] == 'true' || (string)$xmlSheet->headerFooter["differentFirst"] == '1')) {
+									((string) $xmlSheet->headerFooter["differentFirst"] == 'true' || (string) $xmlSheet->headerFooter["differentFirst"] == '1')) {
 									$docHeaderFooter->setDifferentFirst(true);
 								} else {
 									$docHeaderFooter->setDifferentFirst(false);
 								}
 								if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
-									((string)$xmlSheet->headerFooter["scaleWithDoc"] == 'false' || (string)$xmlSheet->headerFooter["scaleWithDoc"] == '0')) {
+									((string) $xmlSheet->headerFooter["scaleWithDoc"] == 'false' || (string) $xmlSheet->headerFooter["scaleWithDoc"] == '0')) {
 									$docHeaderFooter->setScaleWithDocument(false);
 								} else {
 									$docHeaderFooter->setScaleWithDocument(true);
 								}
 								if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
-									((string)$xmlSheet->headerFooter["alignWithMargins"] == 'false' || (string)$xmlSheet->headerFooter["alignWithMargins"] == '0')) {
+									((string) $xmlSheet->headerFooter["alignWithMargins"] == 'false' || (string) $xmlSheet->headerFooter["alignWithMargins"] == '0')) {
 									$docHeaderFooter->setAlignWithMargins(false);
 								} else {
 									$docHeaderFooter->setAlignWithMargins(true);
@@ -1176,27 +1176,27 @@ 
 								$docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
 							}
 
-							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->rowBreaks->brk as $brk) {
 									if ($brk["man"]) {
 										$docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
 									}
 								}
 							}
-							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->colBreaks->brk as $brk) {
 									if ($brk["man"]) {
-										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex($brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
+										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex($brk["id"])."1", PHPExcel_Worksheet::BREAK_COLUMN);
 									}
 								}
 							}
 
-							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
+							if ($xmlSheet && $xmlSheet->dataValidations && ! $this->_readDataOnly) {
 								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
 								    // Uppercase coordinate
 							    	$range = strtoupper($dataValidation["sqref"]);
-									$rangeSet = explode(' ',$range);
-									foreach($rangeSet as $range) {
+									$rangeSet = explode(' ', $range);
+									foreach ($rangeSet as $range) {
 										$stRange = $docSheet->shrinkRangeToFit($range);
 
 										// Extract all cell references in $range
@@ -1224,13 +1224,13 @@ 
 
 							// Add hyperlinks
 							$hyperlinks = array();
-							if (!$this->_readDataOnly) {
+							if ( ! $this->_readDataOnly) {
 								// Locate hyperlink relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
 										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
-											$hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
+											$hyperlinks[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									}
 								}
@@ -1242,17 +1242,17 @@ 
 										$linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
 
 										foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
-											$cell = $docSheet->getCell( $cellReference );
+											$cell = $docSheet->getCell($cellReference);
 											if (isset($linkRel['id'])) {
-												$cell->getHyperlink()->setUrl( $hyperlinks[ (string)$linkRel['id'] ] );
+												$cell->getHyperlink()->setUrl($hyperlinks[(string) $linkRel['id']]);
 											}
 											if (isset($hyperlink['location'])) {
-												$cell->getHyperlink()->setUrl( 'sheet://' . (string)$hyperlink['location'] );
+												$cell->getHyperlink()->setUrl('sheet://'.(string) $hyperlink['location']);
 											}
 
 											// Tooltip
 											if (isset($hyperlink['tooltip'])) {
-												$cell->getHyperlink()->setTooltip( (string)$hyperlink['tooltip'] );
+												$cell->getHyperlink()->setTooltip((string) $hyperlink['tooltip']);
 											}
 										}
 									}
@@ -1262,16 +1262,16 @@ 
 							// Add comments
 							$comments = array();
 							$vmlComments = array();
-							if (!$this->_readDataOnly) {
+							if ( ! $this->_readDataOnly) {
 								// Locate comment relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 									foreach ($relsWorksheet->Relationship as $ele) {
 									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
-											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
+											$comments[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
+											$vmlComments[(string) $ele["Id"]] = (string) $ele["Target"];
 										}
 									}
 								}
@@ -1279,29 +1279,29 @@ 
 								// Loop through comments
 								foreach ($comments as $relName => $relPath) {
 									// Load comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath) );
+									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet")."/".$relPath);
+									$commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath));
 
 									// Utility variables
 									$authors = array();
 
 									// Loop through authors
 									foreach ($commentsFile->authors->author as $author) {
-										$authors[] = (string)$author;
+										$authors[] = (string) $author;
 									}
 
 									// Loop through contents
 									foreach ($commentsFile->commentList->comment as $comment) {
-										$docSheet->getComment( (string)$comment['ref'] )->setAuthor( $authors[(string)$comment['authorId']] );
-										$docSheet->getComment( (string)$comment['ref'] )->setText( $this->_parseRichText($comment->text) );
+										$docSheet->getComment((string) $comment['ref'])->setAuthor($authors[(string) $comment['authorId']]);
+										$docSheet->getComment((string) $comment['ref'])->setText($this->_parseRichText($comment->text));
 									}
 								}
 
 								// Loop through VML comments
 							    foreach ($vmlComments as $relName => $relPath) {
 									// Load VML comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
+									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet")."/".$relPath);
+									$vmlCommentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath));
 									$vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 									$shapes = $vmlCommentsFile->xpath('//v:shape');
@@ -1309,16 +1309,16 @@ 
 										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
 										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
+	    									$style        = (string) $shape['style'];
+	    									$fillColor    = strtoupper(substr((string) $shape['fillcolor'], 1));
 	    									$column       = null;
 	    									$row          = null;
 
 	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
+	    									if (is_array($clientData) && ! empty($clientData)) {
+	        									$clientData = $clientData[0];
 
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
+	        									if (isset($clientData['ObjectType']) && (string) $clientData['ObjectType'] == 'Note') {
 	        									    $temp = $clientData->xpath('.//x:Row');
 	        									    if (is_array($temp)) $row = $temp[0];
 
@@ -1330,7 +1330,7 @@ 
 	    									if (($column !== NULL) && ($row !== NULL)) {
 	    									    // Set comment properties
 	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
+	    									    $comment->getFillColor()->setRGB($fillColor);
 
 	    									    // Parse style
 	    									    $styleArray = explode(';', str_replace(' ', '', $style));
@@ -1341,7 +1341,7 @@ 
 	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
 	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
 	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible($stylePair[1] == 'visible');
 
 	    									    }
 	    									}
@@ -1350,9 +1350,9 @@ 
 								}
 
 								// Header/footer images
-								if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->_readDataOnly) {
-									if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-										$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+								if ($xmlSheet && $xmlSheet->legacyDrawingHF && ! $this->_readDataOnly) {
+									if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+										$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 										$vmlRelationship = '';
 
 										foreach ($relsWorksheet->Relationship as $ele) {
@@ -1363,7 +1363,7 @@ 
 
 										if ($vmlRelationship != '') {
 											// Fetch linked images
-											$relsVML = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels' )); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+											$relsVML = simplexml_load_string($this->_getFromZipArchive($zip, dirname($vmlRelationship).'/_rels/'.basename($vmlRelationship).'.rels')); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 											$drawings = array();
 											foreach ($relsVML->Relationship as $ele) {
 												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
@@ -1384,20 +1384,20 @@ 
 												$imageData = $imageData[0];
 
 												$imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
-												$style = self::toCSSArray( (string)$shape['style'] );
+												$style = self::toCSSArray((string) $shape['style']);
 
-												$hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
+												$hfImages[(string) $shape['id']] = new PHPExcel_Worksheet_HeaderFooterDrawing();
 												if (isset($imageData['title'])) {
-													$hfImages[ (string)$shape['id'] ]->setName( (string)$imageData['title'] );
+													$hfImages[(string) $shape['id']]->setName((string) $imageData['title']);
 												}
 
-												$hfImages[ (string)$shape['id'] ]->setPath("zip://$pFilename#" . $drawings[(string)$imageData['relid']], false);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
-												$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
-												$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
+												$hfImages[(string) $shape['id']]->setPath("zip://$pFilename#".$drawings[(string) $imageData['relid']], false);
+												$hfImages[(string) $shape['id']]->setResizeProportional(false);
+												$hfImages[(string) $shape['id']]->setWidth($style['width']);
+												$hfImages[(string) $shape['id']]->setHeight($style['height']);
+												$hfImages[(string) $shape['id']]->setOffsetX($style['margin-left']);
+												$hfImages[(string) $shape['id']]->setOffsetY($style['margin-top']);
+												$hfImages[(string) $shape['id']]->setResizeProportional(true);
 											}
 
 											$docSheet->getHeaderFooter()->setImages($hfImages);
@@ -1408,18 +1408,18 @@ 
 							}
 
 	// TODO: Make sure drawings and graph are loaded differently!
-							if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+							if ($zip->locateName(dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")) {
+								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet")."/_rels/".basename($fileWorksheet).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 								$drawings = array();
 								foreach ($relsWorksheet->Relationship as $ele) {
 									if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
 										$drawings[(string) $ele["Id"]] = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
 									}
 								}
-								if ($xmlSheet->drawing && !$this->_readDataOnly) {
+								if ($xmlSheet->drawing && ! $this->_readDataOnly) {
 									foreach ($xmlSheet->drawing as $drawing) {
 										$fileDrawing = $drawings[(string) self::array_item($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-										$relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+										$relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip, dirname($fileDrawing)."/_rels/".basename($fileDrawing).".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 										$images = array();
 
 										if ($relsDrawing && $relsDrawing->Relationship) {
@@ -1446,8 +1446,8 @@ 
 													$objDrawing = new PHPExcel_Worksheet_Drawing;
 													$objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
+													$objDrawing->setPath("zip://$pFilename#".$images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col).($oneCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1468,10 +1468,10 @@ 
 													}
 													$objDrawing->setWorksheet($docSheet);
 												} else {
-													$coordinates	= PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
+													$coordinates = PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col).($oneCellAnchor->from->row + 1);
 													$offsetX		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
 													$offsetY		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
-													$width			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
+													$width = PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
 													$height			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
 												}
 											}
@@ -1485,8 +1485,8 @@ 
 													$objDrawing = new PHPExcel_Worksheet_Drawing;
 													$objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
+													$objDrawing->setPath("zip://$pFilename#".$images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col).($twoCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1508,19 +1508,19 @@ 
 														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
 													}
 													$objDrawing->setWorksheet($docSheet);
-												} elseif($this->_includeCharts) {
-													$fromCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
+												} elseif ($this->_includeCharts) {
+													$fromCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col).($twoCellAnchor->from->row + 1);
 													$fromOffsetX	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
 													$fromOffsetY	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-													$toCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
+													$toCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col).($twoCellAnchor->to->row + 1);
 													$toOffsetX		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
 													$toOffsetY		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
-													$graphic		= $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
-													$chartRef		= $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
+													$graphic = $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
+													$chartRef = $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
 													$thisChart		= (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 
 													$chartDetails[$docSheet->getTitle().'!'.$thisChart] =
-															array(	'fromCoordinate'	=> $fromCoordinate,
+															array('fromCoordinate'	=> $fromCoordinate,
 																	'fromOffsetX'		=> $fromOffsetX,
 																	'fromOffsetY'		=> $fromOffsetY,
 																	'toCoordinate'		=> $toCoordinate,
@@ -1540,23 +1540,23 @@ 
 							if ($xmlWorkbook->definedNames) {
 								foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
 									// Extract range
-									$extractedRange = (string)$definedName;
+									$extractedRange = (string) $definedName;
 									$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-									if (($spos = strpos($extractedRange,'!')) !== false) {
-										$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+									if (($spos = strpos($extractedRange, '!')) !== false) {
+										$extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
 									} else {
 										$extractedRange = str_replace('$', '', $extractedRange);
 									}
 
 									// Valid range?
-									if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+									if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
 										continue;
 									}
 
 									// Some definedNames are only applicable if we are on the same sheet...
-									if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
+									if ((string) $definedName['localSheetId'] != '' && (string) $definedName['localSheetId'] == $sheetId) {
 										// Switch on type
-										switch ((string)$definedName['name']) {
+										switch ((string) $definedName['name']) {
 
 											case '_xlnm._FilterDatabase':
 												$docSheet->setAutoFilter($extractedRange);
@@ -1582,14 +1582,14 @@ 
 												break;
 
 											case '_xlnm.Print_Area':
-												$rangeSets = explode(',', $extractedRange);		// FIXME: what if sheetname contains comma?
+												$rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma?
 												$newRangeSets = array();
-												foreach($rangeSets as $rangeSet) {
-													$range = explode('!', $rangeSet);	// FIXME: what if sheetname contains exclamation mark?
+												foreach ($rangeSets as $rangeSet) {
+													$range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark?
 													$rangeSet = isset($range[1]) ? $range[1] : $range[0];
 													$newRangeSets[] = str_replace('$', '', $rangeSet);
 												}
-												$docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets));
+												$docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
 												break;
 
 											default:
@@ -1607,24 +1607,24 @@ 
 						if ($xmlWorkbook->definedNames) {
 							foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
 								// Extract range
-								$extractedRange = (string)$definedName;
+								$extractedRange = (string) $definedName;
 								$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-								if (($spos = strpos($extractedRange,'!')) !== false) {
-									$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+								if (($spos = strpos($extractedRange, '!')) !== false) {
+									$extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
 								} else {
 									$extractedRange = str_replace('$', '', $extractedRange);
 								}
 
 								// Valid range?
-								if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+								if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
 									continue;
 								}
 
 								// Some definedNames are only applicable if we are on the same sheet...
-								if ((string)$definedName['localSheetId'] != '') {
+								if ((string) $definedName['localSheetId'] != '') {
 									// Local defined name
 									// Switch on type
-									switch ((string)$definedName['name']) {
+									switch ((string) $definedName['name']) {
 
 										case '_xlnm._FilterDatabase':
 										case '_xlnm.Print_Titles':
@@ -1632,26 +1632,26 @@ 
 											break;
 
 										default:
-											$range = explode('!', (string)$definedName);
+											$range = explode('!', (string) $definedName);
 											if (count($range) == 2) {
 												$range[0] = str_replace("''", "'", $range[0]);
 												$range[0] = str_replace("'", "", $range[0]);
 												if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
 													$extractedRange = str_replace('$', '', $range[1]);
-													$scope = $docSheet->getParent()->getSheet((string)$definedName['localSheetId']);
+													$scope = $docSheet->getParent()->getSheet((string) $definedName['localSheetId']);
 
-													$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope) );
+													$excel->addNamedRange(new PHPExcel_NamedRange((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
 												}
 											}
 											break;
 									}
-								} else if (!isset($definedName['localSheetId'])) {
+								} else if ( ! isset($definedName['localSheetId'])) {
 									// "Global" definedNames
 									$locatedSheet = null;
 									$extractedSheetName = '';
-									if (strpos( (string)$definedName, '!' ) !== false) {
+									if (strpos((string) $definedName, '!') !== false) {
 										// Extract sheet name
-										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle( (string)$definedName, true );
+										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle((string) $definedName, true);
 										$extractedSheetName = $extractedSheetName[0];
 
 										// Locate sheet
@@ -1663,14 +1663,14 @@ 
 									}
 
 									if ($locatedSheet !== NULL) {
-										$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
+										$excel->addNamedRange(new PHPExcel_NamedRange((string) $definedName['name'], $locatedSheet, $extractedRange, false));
 									}
 								}
 							}
 						}
 					}
 
-					if (!$this->_readDataOnly) {
+					if ( ! $this->_readDataOnly) {
 						// active sheet index
 						$activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
 
@@ -1690,15 +1690,15 @@ 
 		}
 
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$contentTypes = simplexml_load_string($this->_getFromZipArchive($zip, "[Content_Types].xml"));
 			foreach ($contentTypes->Override as $contentType) {
 				switch ($contentType["ContentType"]) {
 					case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
 						if ($this->_includeCharts) {
-							$chartEntryRef = ltrim($contentType['PartName'],'/');
+							$chartEntryRef = ltrim($contentType['PartName'], '/');
 							$chartElements = simplexml_load_string($this->_getFromZipArchive($zip, $chartEntryRef));
-							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
+							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements, basename($chartEntryRef, '.xml'));
 
 //							echo 'Chart ',$chartEntryRef,'<br />';
 //							var_dump($charts[$chartEntryRef]);
@@ -1711,11 +1711,11 @@ 
 
 									$excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
 									$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-									$objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
+									$objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'],
 																   $chartDetails[$chartPositionRef]['fromOffsetX'],
 																   $chartDetails[$chartPositionRef]['fromOffsetY']
 																 );
-									$objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
+									$objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'],
 																	   $chartDetails[$chartPositionRef]['toOffsetX'],
 																	   $chartDetails[$chartPositionRef]['toOffsetY']
 																	 );
@@ -1732,14 +1732,14 @@ 
 	}
 
 
-	private static function _readColor($color, $background=false) {
+	private static function _readColor($color, $background = false) {
 		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
+			return (string) $color["rgb"];
 		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+			return PHPExcel_Style_Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
 		} else if (isset($color["theme"])) {
 			if (self::$_theme !== NULL) {
-				$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
+				$returnColour = self::$_theme->getColourByIndex((int) $color["theme"]);
 				if (isset($color["tint"])) {
 					$tintAdjust = (float) $color["tint"];
 					$returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
@@ -1766,24 +1766,24 @@ 
 			$docStyle->getFont()->setName((string) $style->font->name["val"]);
 			$docStyle->getFont()->setSize((string) $style->font->sz["val"]);
 			if (isset($style->font->b)) {
-				$docStyle->getFont()->setBold(!isset($style->font->b["val"]) || $style->font->b["val"] == 'true' || $style->font->b["val"] == '1');
+				$docStyle->getFont()->setBold( ! isset($style->font->b["val"]) || $style->font->b["val"] == 'true' || $style->font->b["val"] == '1');
 			}
 			if (isset($style->font->i)) {
-				$docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || $style->font->i["val"] == 'true' || $style->font->i["val"] == '1');
+				$docStyle->getFont()->setItalic( ! isset($style->font->i["val"]) || $style->font->i["val"] == 'true' || $style->font->i["val"] == '1');
 			}
 			if (isset($style->font->strike)) {
-				$docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || $style->font->strike["val"] == 'true' || $style->font->strike["val"] == '1');
+				$docStyle->getFont()->setStrikethrough( ! isset($style->font->strike["val"]) || $style->font->strike["val"] == 'true' || $style->font->strike["val"] == '1');
 			}
 			$docStyle->getFont()->getColor()->setARGB(self::_readColor($style->font->color));
 
-			if (isset($style->font->u) && !isset($style->font->u["val"])) {
+			if (isset($style->font->u) && ! isset($style->font->u["val"])) {
 				$docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
 			} else if (isset($style->font->u) && isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
+				$docStyle->getFont()->setUnderline((string) $style->font->u["val"]);
 			}
 
 			if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
-				$vertAlign = strtolower((string)$style->font->vertAlign["val"]);
+				$vertAlign = strtolower((string) $style->font->vertAlign["val"]);
 				if ($vertAlign == 'superscript') {
 					$docStyle->getFont()->setSuperScript(true);
 				}
@@ -1797,23 +1797,23 @@ 
 		if (isset($style->fill)) {
 			if ($style->fill->gradientFill) {
 				$gradientFill = $style->fill->gradientFill[0];
-				if(!empty($gradientFill["type"])) {
+				if ( ! empty($gradientFill["type"])) {
 					$docStyle->getFill()->setFillType((string) $gradientFill["type"]);
 				}
 				$docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
 				$gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color) );
-				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color) );
+				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor(self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color));
+				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor(self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color));
 			} elseif ($style->fill->patternFill) {
-				$patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
+				$patternType = (string) $style->fill->patternFill["patternType"] != '' ? (string) $style->fill->patternFill["patternType"] : 'solid';
 				$docStyle->getFill()->setFillType($patternType);
 				if ($style->fill->patternFill->fgColor) {
-					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor,true));
+					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor, true));
 				} else {
 					$docStyle->getFill()->getStartColor()->setARGB('FF000000');
 				}
 				if ($style->fill->patternFill->bgColor) {
-					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor,true));
+					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor, true));
 				}
 			}
 		}
@@ -1850,22 +1850,22 @@ 
 			$docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
 
 			$textRotation = 0;
-			if ((int)$style->alignment["textRotation"] <= 90) {
-				$textRotation = (int)$style->alignment["textRotation"];
-			} else if ((int)$style->alignment["textRotation"] > 90) {
-				$textRotation = 90 - (int)$style->alignment["textRotation"];
+			if ((int) $style->alignment["textRotation"] <= 90) {
+				$textRotation = (int) $style->alignment["textRotation"];
+			} else if ((int) $style->alignment["textRotation"] > 90) {
+				$textRotation = 90 - (int) $style->alignment["textRotation"];
 			}
 
 			$docStyle->getAlignment()->setTextRotation(intval($textRotation));
-			$docStyle->getAlignment()->setWrapText( (string)$style->alignment["wrapText"] == "true" || (string)$style->alignment["wrapText"] == "1" );
-			$docStyle->getAlignment()->setShrinkToFit( (string)$style->alignment["shrinkToFit"] == "true" || (string)$style->alignment["shrinkToFit"] == "1" );
-			$docStyle->getAlignment()->setIndent( intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0 );
+			$docStyle->getAlignment()->setWrapText((string) $style->alignment["wrapText"] == "true" || (string) $style->alignment["wrapText"] == "1");
+			$docStyle->getAlignment()->setShrinkToFit((string) $style->alignment["shrinkToFit"] == "true" || (string) $style->alignment["shrinkToFit"] == "1");
+			$docStyle->getAlignment()->setIndent(intval((string) $style->alignment["indent"]) > 0 ? intval((string) $style->alignment["indent"]) : 0);
 		}
 
 		// protection
 		if (isset($style->protection)) {
 			if (isset($style->protection['locked'])) {
-				if ((string)$style->protection['locked'] == 'true') {
+				if ((string) $style->protection['locked'] == 'true') {
 					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
 				} else {
 					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
@@ -1873,7 +1873,7 @@ 
 			}
 
 			if (isset($style->protection['hidden'])) {
-				if ((string)$style->protection['hidden'] == 'true') {
+				if ((string) $style->protection['hidden'] == 'true') {
 					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
 				} else {
 					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
@@ -1897,14 +1897,14 @@ 
 		$value = new PHPExcel_RichText();
 
 		if (isset($is->t)) {
-			$value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $is->t ) );
+			$value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $is->t));
 		} else {
 			foreach ($is->r as $run) {
-				if (!isset($run->rPr)) {
-					$objText = $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+				if ( ! isset($run->rPr)) {
+					$objText = $value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
 
 				} else {
-					$objText = $value->createTextRun( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+					$objText = $value->createTextRun(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
 
 					if (isset($run->rPr->rFont["val"])) {
 						$objText->getFont()->setName((string) $run->rPr->rFont["val"]);
@@ -1915,21 +1915,21 @@ 
 					}
 
 					if (isset($run->rPr->color)) {
-						$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($run->rPr->color) ) );
+						$objText->getFont()->setColor(new PHPExcel_Style_Color(self::_readColor($run->rPr->color)));
 					}
 
-					if ( (isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
-					     || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
+					if ((isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
+					     || (isset($run->rPr->b) && ! isset($run->rPr->b["val"]))) {
 						$objText->getFont()->setBold(true);
 					}
 
-					if ( (isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
-					     || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
+					if ((isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
+					     || (isset($run->rPr->i) && ! isset($run->rPr->i["val"]))) {
 						$objText->getFont()->setItalic(true);
 					}
 
 					if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
-						$vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
+						$vertAlign = strtolower((string) $run->rPr->vertAlign["val"]);
 						if ($vertAlign == 'superscript') {
 							$objText->getFont()->setSuperScript(true);
 						}
@@ -1938,14 +1938,14 @@ 
 						}
 					}
 
-					if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
+					if (isset($run->rPr->u) && ! isset($run->rPr->u["val"])) {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
 					} else if (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
+						$objText->getFont()->setUnderline((string) $run->rPr->u["val"]);
 					}
 
-					if ( (isset($run->rPr->strike["val"])  && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
-					     || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
+					if ((isset($run->rPr->strike["val"]) && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
+					     || (isset($run->rPr->strike) && ! isset($run->rPr->strike["val"]))) {
 						$objText->getFont()->setStrikethrough(true);
 					}
 				}
@@ -1962,12 +1962,12 @@ 
 
 
 	private static function dir_add($base, $add) {
-		return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+		return preg_replace('~[^/]+/\.\./~', '', dirname($base)."/$add");
 	}
 
 
 	private static function toCSSArray($style) {
-		$style = str_replace(array("\r","\n"), "", $style);
+		$style = str_replace(array("\r", "\n"), "", $style);
 
 		$temp = explode(';', $style);
 		$style = array();

Braces +34 added lines, -14 removed lines

@@ -561,10 +561,12 @@ 
 					$xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
 					if (is_object($xmlCore)) {
 						$docProps = $excel->getProperties();
-						if (isset($xmlCore->Company))
-							$docProps->setCompany((string) $xmlCore->Company);
-						if (isset($xmlCore->Manager))
-							$docProps->setManager((string) $xmlCore->Manager);
+						if (isset($xmlCore->Company)) {
+													$docProps->setCompany((string) $xmlCore->Company);
+						}
+						if (isset($xmlCore->Manager)) {
+													$docProps->setManager((string) $xmlCore->Manager);
+						}
 					}
 				break;
 
@@ -1000,9 +1002,13 @@ 
 
 										// Check for numeric values
 										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
+											if ($value == (int)$value) {
+												$value = (int)$value;
+											} elseif ($value == (float)$value) {
+												$value = (float)$value;
+											} elseif ($value == (double)$value) {
+												$value = (double)$value;
+											}
 										}
 
 										// Rich text?
@@ -1320,10 +1326,14 @@ 
 
 	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
 	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
+	        									    if (is_array($temp)) {
+	        									    	$row = $temp[0];
+	        									    }
 
 	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
+	        									    if (is_array($temp)) {
+	        									    	$column = $temp[0];
+	        									    }
 	        									}
 	    									}
 
@@ -1337,11 +1347,21 @@ 
 	    									    foreach ($styleArray as $stylePair) {
 	    									        $stylePair = explode(':', $stylePair);
 
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
+	    									        if ($stylePair[0] == 'margin-left') {
+	    									        	$comment->setMarginLeft($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'margin-top') {
+	    									        	$comment->setMarginTop($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'width') {
+	    									        	$comment->setWidth($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'height') {
+	    									        	$comment->setHeight($stylePair[1]);
+	    									        }
+	    									        if ($stylePair[0] == 'visibility') {
+	    									        	$comment->setVisible( $stylePair[1] == 'visible' );
+	    									        }
 
 	    									    }
 	    									}

app/Vendor/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php

Doc Comments +11 added lines

@@ -34,6 +34,10 @@ 
  */
 class PHPExcel_Reader_Excel2007_Chart
 {
+	/**
+	 * @param string $name
+	 * @param string $format
+	 */
 	private static function _getAttribute($component, $name, $format) {
 		$attributes = $component->attributes();
 		if (isset($attributes[$name])) {
@@ -60,6 +64,10 @@ 
 	}
 
 
+	/**
+	 * @param SimpleXMLElement $chartElements
+	 * @param string $chartName
+	 */
 	public static function readChart($chartElements,$chartName) {
 		$namespacesChartMeta = $chartElements->getNamespaces(true);
 		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
@@ -188,6 +196,9 @@ 
 	}	//	function readChart()
 
 
+	/**
+	 * @param string $type
+	 */
 	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
 		$caption = array();
 		$titleLayout = null;

Spacing +67 added lines, -67 removed lines

@@ -51,104 +51,104 @@ 
 	}	//	function _getAttribute()
 
 
-	private static function _readColor($color,$background=false) {
+	private static function _readColor($color, $background = false) {
 		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
+			return (string) $color["rgb"];
 		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+			return PHPExcel_Style_Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
 		}
 	}
 
 
-	public static function readChart($chartElements,$chartName) {
+	public static function readChart($chartElements, $chartName) {
 		$namespacesChartMeta = $chartElements->getNamespaces(true);
 		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
 
 		$XaxisLabel = $YaxisLabel = $legend = $title = null;
 
-		foreach($chartElementsC as $chartElementKey => $chartElement) {
+		foreach ($chartElementsC as $chartElementKey => $chartElement) {
 			switch ($chartElementKey) {
 				case "chart":
-					foreach($chartElement as $chartDetailsKey => $chartDetails) {
+					foreach ($chartElement as $chartDetailsKey => $chartDetails) {
 						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
 						switch ($chartDetailsKey) {
 							case "plotArea":
 									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
 									$plotSeries = array();
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+									foreach ($chartDetails as $chartDetailKey => $chartDetail) {
 										switch ($chartDetailKey) {
 											case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
+												$plotAreaLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
 												break;
 											case "catAx":
 												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "dateAx":
 												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "valAx":
 												if (isset($chartDetail->title)) {
-													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
 												}
 												break;
 											case "barChart":
 											case "bar3DChart":
 												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotDirection($barDirection);
 												$plotSeries[] = $plotSer;
 												break;
 											case "lineChart":
 											case "line3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 											case "areaChart":
 											case "area3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 											case "doughnutChart":
 											case "pieChart":
 											case "pie3DChart":
 												$explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($explosion);
 												$plotSeries[] = $plotSer;
 												break;
 											case "scatterChart":
 												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($scatterStyle);
 												$plotSeries[] = $plotSer;
 												break;
 											case "bubbleChart":
 												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($bubbleScale);
 												$plotSeries[] = $plotSer;
 												break;
 											case "radarChart":
 												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($radarStyle);
 												$plotSeries[] = $plotSer;
 												break;
 											case "surfaceChart":
 											case "surface3DChart":
 												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												$plotSer->setPlotStyle($wireFrame);
 												$plotSeries[] = $plotSer;
 												break;
 											case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSeries[] = self::_chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
 												break;
 										}
 									}
-									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
+									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries);
 									break;
 							case "plotVisOnly":
 									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
@@ -157,13 +157,13 @@ 
 									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
 									break;
 							case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
+									$title = self::_chartTitle($chartDetails, $namespacesChartMeta, 'title');
 									break;
 							case "legend":
 									$legendPos = 'r';
 									$legendLayout = null;
 									$legendOverlay = false;
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+									foreach ($chartDetails as $chartDetailKey => $chartDetail) {
 										switch ($chartDetailKey) {
 											case "legendPos":
 												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
@@ -172,7 +172,7 @@ 
 												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
 												break;
 											case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
+												$legendLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
 												break;
 										}
 									}
@@ -182,20 +182,20 @@ 
 					}
 			}
 		}
-		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
+		$chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
 
 		return $chart;
 	}	//	function readChart()
 
 
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
+	private static function _chartTitle($titleDetails, $namespacesChartMeta, $type) {
 		$caption = array();
 		$titleLayout = null;
-		foreach($titleDetails as $titleDetailKey => $chartDetail) {
+		foreach ($titleDetails as $titleDetailKey => $chartDetail) {
 			switch ($titleDetailKey) {
 				case "tx":
 					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-					foreach($titleDetails as $titleKey => $titleDetail) {
+					foreach ($titleDetails as $titleKey => $titleDetail) {
 						switch ($titleKey) {
 							case "p":
 								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
@@ -204,7 +204,7 @@ 
 					}
 					break;
 				case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
+					$titleLayout = self::_chartLayoutDetails($chartDetail, $namespacesChartMeta);
 					break;
 			}
 		}
@@ -213,8 +213,8 @@ 
 	}	//	function _chartTitle()
 
 
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
-		if (!isset($chartDetail->manualLayout)) {
+	private static function _chartLayoutDetails($chartDetail, $namespacesChartMeta) {
+		if ( ! isset($chartDetail->manualLayout)) {
 			return null;
 		}
 		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
@@ -222,7 +222,7 @@ 
 			return null;
 		}
 		$layout = array();
-		foreach($details as $detailKey => $detail) {
+		foreach ($details as $detailKey => $detail) {
 //			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),'<br />';
 			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
 		}
@@ -230,20 +230,20 @@ 
 	}	//	function _chartLayoutDetails()
 
 
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
+	private static function _chartDataSeries($chartDetail, $namespacesChartMeta, $plotType) {
 		$multiSeriesType = NULL;
 		$smoothLine = false;
 		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
 
 		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
-		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+		foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
 			switch ($seriesDetailKey) {
 				case "grouping":
 					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
 					break;
 				case "ser":
 					$marker = NULL;
-					foreach($seriesDetails as $seriesKey => $seriesDetail) {
+					foreach ($seriesDetails as $seriesKey => $seriesDetail) {
 						switch ($seriesKey) {
 							case "idx":
 								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
@@ -253,7 +253,7 @@ 
 								$plotOrder[$seriesIndex] = $seriesOrder;
 								break;
 							case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
 								break;
 							case "marker":
 								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
@@ -262,59 +262,59 @@ 
 								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
 								break;
 							case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
 								break;
 							case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 							case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 							case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
 								break;
 						}
 					}
 			}
 		}
-		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
+		return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
 	}	//	function _chartDataSeries()
 
 
 	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
 		if (isset($seriesDetail->strRef)) {
 			$seriesSource = (string) $seriesDetail->strRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->numRef)) {
 			$seriesSource = (string) $seriesDetail->numRef->f;
 			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
 
-			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->multiLvlStrRef)) {
 			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
 			$seriesData['pointCount'] = count($seriesData['dataValues']);
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		} elseif (isset($seriesDetail->multiLvlNumRef)) {
 			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
 			$seriesData['pointCount'] = count($seriesData['dataValues']);
 
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+			return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
 		}
 		return null;
 	}	//	function _chartDataSeriesValueSet()
 
 
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
+	private static function _chartDataSeriesValues($seriesValueSet, $dataType = 'n') {
 		$seriesVal = array();
 		$formatCode = '';
 		$pointCount = 0;
 
-		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
+		foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
 			switch ($seriesValueIdx) {
 				case 'ptCount':
 					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
@@ -333,20 +333,20 @@ 
 			}
 		}
 
-		return array( 'formatCode'	=> $formatCode,
+		return array('formatCode'	=> $formatCode,
 					  'pointCount'	=> $pointCount,
 					  'dataValues'	=> $seriesVal
 					);
 	}	//	function _chartDataSeriesValues()
 
 
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
+	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n') {
 		$seriesVal = array();
 		$formatCode = '';
 		$pointCount = 0;
 
-		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
-			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
+		foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+			foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
 				switch ($seriesValueIdx) {
 					case 'ptCount':
 						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
@@ -366,7 +366,7 @@ 
 			}
 		}
 
-		return array( 'formatCode'	=> $formatCode,
+		return array('formatCode'	=> $formatCode,
 					  'pointCount'	=> $pointCount,
 					  'dataValues'	=> $seriesVal
 					);
@@ -375,9 +375,9 @@ 
 	private static function _parseRichText($titleDetailPart = null) {
 		$value = new PHPExcel_RichText();
 
-		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+		foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
 			if (isset($titleDetailElement->t)) {
-				$objText = $value->createTextRun( (string) $titleDetailElement->t );
+				$objText = $value->createTextRun((string) $titleDetailElement->t);
 			}
 			if (isset($titleDetailElement->rPr)) {
 				if (isset($titleDetailElement->rPr->rFont["val"])) {
@@ -385,39 +385,39 @@ 
 				}
 
 				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-				if (!is_null($fontSize)) {
+				if ( ! is_null($fontSize)) {
 					$objText->getFont()->setSize(floor($fontSize / 100));
 				}
 
 				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
-				if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
+				if ( ! is_null($fontColor)) {
+					$objText->getFont()->setColor(new PHPExcel_Style_Color(self::_readColor($fontColor)));
 				}
 
 				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-				if (!is_null($bold)) {
+				if ( ! is_null($bold)) {
 					$objText->getFont()->setBold($bold);
 				}
 
 				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-				if (!is_null($italic)) {
+				if ( ! is_null($italic)) {
 					$objText->getFont()->setItalic($italic);
 				}
 
 				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-				if (!is_null($baseline)) {
+				if ( ! is_null($baseline)) {
 					if ($baseline > 0) {
 						$objText->getFont()->setSuperScript(true);
-					} elseif($baseline < 0) {
+					} elseif ($baseline < 0) {
 						$objText->getFont()->setSubScript(true);
 					}
 				}
 
 				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
-				if (!is_null($underscore)) {
+				if ( ! is_null($underscore)) {
 					if ($underscore == 'sng') {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} elseif($underscore == 'dbl') {
+					} elseif ($underscore == 'dbl') {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
 					} else {
 						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
@@ -425,7 +425,7 @@ 
 				}
 
 				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
-				if (!is_null($strikethrough)) {
+				if ( ! is_null($strikethrough)) {
 					if ($strikethrough == 'noStrike') {
 						$objText->getFont()->setStrikethrough(false);
 					} else {

app/Vendor/PHPExcel/PHPExcel/Reader/Excel5.php

Doc Comments +13 added lines, -9 removed lines

@@ -508,7 +508,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -4972,7 +4972,7 @@ 
 	 * is in one piece.
 	 * Moves to next current position in data stream to start of next record different from a CONtINUE record
 	 *
-	 * @return array
+	 * @return integer|null
 	 */
 	private function _getSplicedRecordData()
 	{
@@ -5078,8 +5078,7 @@ 
 	 * Take array of tokens together with additional data for formula and return human readable formula
 	 *
 	 * @param array $tokens
-	 * @param array $additionalData Additional binary data going with the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+	 * @param string $additionalData Additional binary data going with the formula
 	 * @return string Human readable formula
 	 */
 	private function _createFormulaFromTokens($tokens, $additionalData)
@@ -5243,7 +5242,8 @@ 
 	 *
 	 * @param string Formula data
 	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return array
+	 * @param string $formulaData
+	 * @return string
 	 * @throws Exception
 	 */
 	private function _getNextToken($formulaData, $baseCell = 'A1')
@@ -6097,7 +6097,7 @@ 
 	 * section 2.5.15
 	 *
 	 * @param string $subData
-	 * @return array
+	 * @return string
 	 */
 	private function _readBIFF8CellRangeAddressList($subData)
 	{
@@ -6212,7 +6212,7 @@ 
 	 * section 2.5.8
 	 *
 	 * @param string $arrayData
-	 * @return array
+	 * @return string
 	 */
 	private static function _readBIFF8ConstantArray($arrayData)
 	{
@@ -6251,7 +6251,7 @@ 
 	 * returns e.g. array('value' => '5', 'size' => 9)
 	 *
 	 * @param string $valueData
-	 * @return array
+	 * @return string
 	 */
 	private static function _readBIFF8Constant($valueData)
 	{
@@ -6493,6 +6493,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $rknum
+	 */
 	private static function _GetIEEE754($rknum)
 	{
 		if (($rknum & 0x02) != 0) {
@@ -6523,7 +6526,7 @@ 
 	 * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
 	 *
 	 * @param string $string
-	 * @param bool $compressed
+	 * @param string|boolean $compressed
 	 * @return string
 	 */
 	private static function _encodeUTF16($string, $compressed = '')
@@ -6607,6 +6610,7 @@ 
 	 *
 	 * @param int $color Indexed color
 	 * @param array $palette Color palette
+	 * @param integer $version
 	 * @return array RGB color value, example: array('rgb' => 'FF0000')
 	 */
 	private static function _readColor($color,$palette,$version)

Switch Indentation +890 added lines, -890 removed lines

@@ -969,55 +969,55 @@ 
 
 				switch ($obj['otObjType']) {
 
-				case 0x19:
-					// Note
-//					echo 'Cell Annotation Object<br />';
-//					echo 'Object ID is ',$obj['idObjID'],'<br />';
-//
-					if (isset($this->_cellNotes[$obj['idObjID']])) {
-						$cellNote = $this->_cellNotes[$obj['idObjID']];
-
-//						echo '_cellNotes[',$obj['idObjID'],']: ';
-//						var_dump($cellNote);
-//						echo '<br />';
-//
-						if (isset($this->_textObjects[$obj['idObjID']])) {
-							$textObject = $this->_textObjects[$obj['idObjID']];
-//							echo '_textObject: ';
-//							var_dump($textObject);
-//							echo '<br />';
-//
-							$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
-							$text = $textObject['text'];
+					case 0x19:
+						// Note
+	//					echo 'Cell Annotation Object<br />';
+	//					echo 'Object ID is ',$obj['idObjID'],'<br />';
+	//
+						if (isset($this->_cellNotes[$obj['idObjID']])) {
+							$cellNote = $this->_cellNotes[$obj['idObjID']];
+
+	//						echo '_cellNotes[',$obj['idObjID'],']: ';
+	//						var_dump($cellNote);
+	//						echo '<br />';
+	//
+							if (isset($this->_textObjects[$obj['idObjID']])) {
+								$textObject = $this->_textObjects[$obj['idObjID']];
+	//							echo '_textObject: ';
+	//							var_dump($textObject);
+	//							echo '<br />';
+	//
+								$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
+								$text = $textObject['text'];
+							}
+	//						echo $text,'<br />';
 						}
-//						echo $text,'<br />';
-					}
-					break;
+						break;
 
-				case 0x08:
-//					echo 'Picture Object<br />';
-					// picture
-
-					// get index to BSE entry (1-based)
-					$BSEindex = $spContainer->getOPT(0x0104);
-					$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-					$BSE = $BSECollection[$BSEindex - 1];
-					$blipType = $BSE->getBlipType();
-
-					// need check because some blip types are not supported by Escher reader such as EMF
-					if ($blip = $BSE->getBlip()) {
-						$ih = imagecreatefromstring($blip->getData());
-						$drawing = new PHPExcel_Worksheet_MemoryDrawing();
-						$drawing->setImageResource($ih);
-
-						// width, height, offsetX, offsetY
-						$drawing->setResizeProportional(false);
-						$drawing->setWidth($width);
-						$drawing->setHeight($height);
-						$drawing->setOffsetX($offsetX);
-						$drawing->setOffsetY($offsetY);
-
-						switch ($blipType) {
+					case 0x08:
+	//					echo 'Picture Object<br />';
+						// picture
+
+						// get index to BSE entry (1-based)
+						$BSEindex = $spContainer->getOPT(0x0104);
+						$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
+						$BSE = $BSECollection[$BSEindex - 1];
+						$blipType = $BSE->getBlipType();
+
+						// need check because some blip types are not supported by Escher reader such as EMF
+						if ($blip = $BSE->getBlip()) {
+							$ih = imagecreatefromstring($blip->getData());
+							$drawing = new PHPExcel_Worksheet_MemoryDrawing();
+							$drawing->setImageResource($ih);
+
+							// width, height, offsetX, offsetY
+							$drawing->setResizeProportional(false);
+							$drawing->setWidth($width);
+							$drawing->setHeight($height);
+							$drawing->setOffsetX($offsetX);
+							$drawing->setOffsetY($offsetY);
+
+							switch ($blipType) {
 							case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
 								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
 								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
@@ -1027,7 +1027,7 @@ 
 								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
 								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
 								break;
-						}
+							}
 
 						$drawing->setWorksheet($this->_phpSheet);
 						$drawing->setCoordinates($spContainer->getStartCoordinates());
@@ -1035,9 +1035,9 @@ 
 
 					break;
 
-				default:
-					// other object type
-					break;
+					default:
+						// other object type
+						break;
 
 				}
 			}
@@ -1071,74 +1071,74 @@ 
 			if ($definedName['isBuiltInName']) {
 				switch ($definedName['name']) {
 
-				case pack('C', 0x06):
-					// print area
-					//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
+					case pack('C', 0x06):
+						// print area
+						//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
 
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+						$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
 
-					$extractedRanges = array();
-					foreach ($ranges as $range) {
-						// $range should look like one of these
-						//		Foo!$C$7:$J$66
-						//		Bar!$A$1:$IV$2
+						$extractedRanges = array();
+						foreach ($ranges as $range) {
+							// $range should look like one of these
+							//		Foo!$C$7:$J$66
+							//		Bar!$A$1:$IV$2
 
-						$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
-						$sheetName = $explodes[0];
+							$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
+							$sheetName = $explodes[0];
 
-						if (count($explodes) == 2) {
-							$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+							if (count($explodes) == 2) {
+								$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+							}
 						}
-					}
-					if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
-						$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
-					}
-					break;
+						if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
+							$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
+						}
+						break;
 
-				case pack('C', 0x07):
-					// print titles (repeating rows)
-					// Assuming BIFF8, there are 3 cases
-					// 1. repeating rows
-					//		formula looks like this: Sheet!$A$1:$IV$2
-					//		rows 1-2 repeat
-					// 2. repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536
-					//		columns A-B repeat
-					// 3. both repeating rows and repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
-
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					foreach ($ranges as $range) {
-						// $range should look like this one of these
-						//		Sheet!$A$1:$B$65536
-						//		Sheet!$A$1:$IV$2
-
-						$explodes = explode('!', $range);
-
-						if (count($explodes) == 2) {
-							if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
-
-								$extractedRange = $explodes[1];
-								$extractedRange = str_replace('$', '', $extractedRange);
-
-								$coordinateStrings = explode(':', $extractedRange);
-								if (count($coordinateStrings) == 2) {
-									list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
-									list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
-
-									if ($firstColumn == 'A' and $lastColumn == 'IV') {
-										// then we have repeating rows
-										$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
-									} elseif ($firstRow == 1 and $lastRow == 65536) {
-										// then we have repeating columns
-										$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
+					case pack('C', 0x07):
+						// print titles (repeating rows)
+						// Assuming BIFF8, there are 3 cases
+						// 1. repeating rows
+						//		formula looks like this: Sheet!$A$1:$IV$2
+						//		rows 1-2 repeat
+						// 2. repeating columns
+						//		formula looks like this: Sheet!$A$1:$B$65536
+						//		columns A-B repeat
+						// 3. both repeating rows and repeating columns
+						//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
+
+						$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+
+						foreach ($ranges as $range) {
+							// $range should look like this one of these
+							//		Sheet!$A$1:$B$65536
+							//		Sheet!$A$1:$IV$2
+
+							$explodes = explode('!', $range);
+
+							if (count($explodes) == 2) {
+								if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
+
+									$extractedRange = $explodes[1];
+									$extractedRange = str_replace('$', '', $extractedRange);
+
+									$coordinateStrings = explode(':', $extractedRange);
+									if (count($coordinateStrings) == 2) {
+										list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
+										list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
+
+										if ($firstColumn == 'A' and $lastColumn == 'IV') {
+											// then we have repeating rows
+											$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
+										} elseif ($firstRow == 1 and $lastRow == 65536) {
+											// then we have repeating columns
+											$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
+										}
 									}
 								}
 							}
 						}
-					}
-					break;
+						break;
 
 				}
 			} else {
@@ -2368,12 +2368,12 @@ 
 				$builtInId = ord($recordData{2});
 
 				switch ($builtInId) {
-				case 0x00:
-					// currently, we are not using this for anything
-					break;
+					case 0x00:
+						// currently, we are not using this for anything
+						break;
 
-				default:
-					break;
+					default:
+						break;
 				}
 
 			} else {
@@ -3181,8 +3181,8 @@ 
 			if (!$isNotInit) {
 				$this->_phpSheet->getPageSetup()->setPaperSize($paperSize);
 				switch ($isPortrait) {
-				case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
-				case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
+					case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
+					case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
 				}
 
 				$this->_phpSheet->getPageSetup()->setScale($scale, false);
@@ -4356,90 +4356,90 @@ 
 			}
 
 			switch ($hyperlinkType) {
-			case 'URL':
-				// section 5.58.2: Hyperlink containing a URL
-				// e.g. http://example.org/index.php
-
-				// offset: var; size: 16; GUID of URL Moniker
-				$offset += 16;
-				// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
-				$us = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
-				$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
-				$url .= $hasText ? '#' : '';
-				$offset += $us;
-				break;
-
-			case 'local':
-				// section 5.58.3: Hyperlink to local file
-				// examples:
-				//   mydoc.txt
-				//   ../../somedoc.xls#Sheet!A1
+				case 'URL':
+					// section 5.58.2: Hyperlink containing a URL
+					// e.g. http://example.org/index.php
+
+					// offset: var; size: 16; GUID of URL Moniker
+					$offset += 16;
+					// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
+					$us = self::_GetInt4d($recordData, $offset);
+					$offset += 4;
+					// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
+					$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
+					$url .= $hasText ? '#' : '';
+					$offset += $us;
+					break;
 
-				// offset: var; size: 16; GUI of File Moniker
-				$offset += 16;
+				case 'local':
+					// section 5.58.3: Hyperlink to local file
+					// examples:
+					//   mydoc.txt
+					//   ../../somedoc.xls#Sheet!A1
 
-				// offset: var; size: 2; directory up-level count.
-				$upLevelCount = self::_GetInt2d($recordData, $offset);
-				$offset += 2;
+					// offset: var; size: 16; GUI of File Moniker
+					$offset += 16;
 
-				// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
-				$sl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
+					// offset: var; size: 2; directory up-level count.
+					$upLevelCount = self::_GetInt2d($recordData, $offset);
+					$offset += 2;
 
-				// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
-				$shortenedFilePath = substr($recordData, $offset, $sl);
-				$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
-				$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
+					// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
+					$sl = self::_GetInt4d($recordData, $offset);
+					$offset += 4;
 
-				$offset += $sl;
+					// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
+					$shortenedFilePath = substr($recordData, $offset, $sl);
+					$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
+					$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
 
-				// offset: var; size: 24; unknown sequence
-				$offset += 24;
+					$offset += $sl;
 
-				// extended file path
-				// offset: var; size: 4; size of the following file link field including string lenth mark
-				$sz = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
+					// offset: var; size: 24; unknown sequence
+					$offset += 24;
 
-				// only present if $sz > 0
-				if ($sz > 0) {
-					// offset: var; size: 4; size of the character array of the extended file path and name
-					$xl = self::_GetInt4d($recordData, $offset);
+					// extended file path
+					// offset: var; size: 4; size of the following file link field including string lenth mark
+					$sz = self::_GetInt4d($recordData, $offset);
 					$offset += 4;
 
-					// offset: var; size 2; unknown
-					$offset += 2;
+					// only present if $sz > 0
+					if ($sz > 0) {
+						// offset: var; size: 4; size of the character array of the extended file path and name
+						$xl = self::_GetInt4d($recordData, $offset);
+						$offset += 4;
 
-					// offset: var; size $xl; character array of the extended file path and name.
-					$extendedFilePath = substr($recordData, $offset, $xl);
-					$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
-					$offset += $xl;
-				}
+						// offset: var; size 2; unknown
+						$offset += 2;
 
-				// construct the path
-				$url = str_repeat('..\\', $upLevelCount);
-				$url .= ($sz > 0) ?
-					$extendedFilePath : $shortenedFilePath; // use extended path if available
-				$url .= $hasText ? '#' : '';
+						// offset: var; size $xl; character array of the extended file path and name.
+						$extendedFilePath = substr($recordData, $offset, $xl);
+						$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
+						$offset += $xl;
+					}
 
-				break;
+					// construct the path
+					$url = str_repeat('..\\', $upLevelCount);
+					$url .= ($sz > 0) ?
+						$extendedFilePath : $shortenedFilePath; // use extended path if available
+					$url .= $hasText ? '#' : '';
 
+					break;
 
-			case 'UNC':
-				// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
-				// todo: implement
-				return;
 
-			case 'workbook':
-				// section 5.58.5: Hyperlink to the Current Workbook
-				// e.g. Sheet2!B1:C2, stored in text mark field
-				$url = 'sheet://';
-				break;
+				case 'UNC':
+					// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
+					// todo: implement
+					return;
 
-			default:
-				return;
+				case 'workbook':
+					// section 5.58.5: Hyperlink to the Current Workbook
+					// e.g. Sheet2!B1:C2, stored in text mark field
+					$url = 'sheet://';
+					break;
+
+				default:
+					return;
 
 			}
 
@@ -4861,54 +4861,54 @@ 
 		$iData = substr($recordData, 8);
 
 		switch ($cf) {
-		case 0x09: // Windows bitmap format
-			// BITMAPCOREINFO
-			// 1. BITMAPCOREHEADER
-			// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
-			$bcSize = self::_GetInt4d($iData, 0);
-//			var_dump($bcSize);
-
-			// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
-			$bcWidth = self::_GetInt2d($iData, 4);
-//			var_dump($bcWidth);
-
-			// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
-			$bcHeight = self::_GetInt2d($iData, 6);
-//			var_dump($bcHeight);
-			$ih = imagecreatetruecolor($bcWidth, $bcHeight);
-
-			// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
-
-			// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
-			$bcBitCount = self::_GetInt2d($iData, 10);
-//			var_dump($bcBitCount);
-
-			$rgbString = substr($iData, 12);
-			$rgbTriples = array();
-			while (strlen($rgbString) > 0) {
-				$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
-				$rgbString = substr($rgbString, 3);
-			}
-			$x = 0;
-			$y = 0;
-			foreach ($rgbTriples as $i => $rgbTriple) {
-				$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
-				imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
-				$x = ($x + 1) % $bcWidth;
-				$y = $y + floor(($x + 1) / $bcWidth);
-			}
-			//imagepng($ih, 'image.png');
+			case 0x09: // Windows bitmap format
+				// BITMAPCOREINFO
+				// 1. BITMAPCOREHEADER
+				// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
+				$bcSize = self::_GetInt4d($iData, 0);
+	//			var_dump($bcSize);
+
+				// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
+				$bcWidth = self::_GetInt2d($iData, 4);
+	//			var_dump($bcWidth);
+
+				// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
+				$bcHeight = self::_GetInt2d($iData, 6);
+	//			var_dump($bcHeight);
+				$ih = imagecreatetruecolor($bcWidth, $bcHeight);
+
+				// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
+
+				// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
+				$bcBitCount = self::_GetInt2d($iData, 10);
+	//			var_dump($bcBitCount);
+
+				$rgbString = substr($iData, 12);
+				$rgbTriples = array();
+				while (strlen($rgbString) > 0) {
+					$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
+					$rgbString = substr($rgbString, 3);
+				}
+				$x = 0;
+				$y = 0;
+				foreach ($rgbTriples as $i => $rgbTriple) {
+					$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
+					imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
+					$x = ($x + 1) % $bcWidth;
+					$y = $y + floor(($x + 1) / $bcWidth);
+				}
+				//imagepng($ih, 'image.png');
 
-			$drawing = new PHPExcel_Worksheet_Drawing();
-			$drawing->setPath($filename);
-			$drawing->setWorksheet($this->_phpSheet);
+				$drawing = new PHPExcel_Worksheet_Drawing();
+				$drawing->setPath($filename);
+				$drawing->setWorksheet($this->_phpSheet);
 
-			break;
+				break;
 
-		case 0x02: // Windows metafile or Macintosh PICT format
-		case 0x0e: // native format
-		default;
-			break;
+			case 0x02: // Windows metafile or Macintosh PICT format
+			case 0x0e: // native format
+			default;
+				break;
 
 		}
 
@@ -5100,132 +5100,132 @@ 
 			$space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis
 
 			switch ($token['name']) {
-			case 'tAdd': // addition
-			case 'tConcat': // addition
-			case 'tDiv': // division
-			case 'tEQ': // equality
-			case 'tGE': // greater than or equal
-			case 'tGT': // greater than
-			case 'tIsect': // intersection
-			case 'tLE': // less than or equal
-			case 'tList': // less than or equal
-			case 'tLT': // less than
-			case 'tMul': // multiplication
-			case 'tNE': // multiplication
-			case 'tPower': // power
-			case 'tRange': // range
-			case 'tSub': // subtraction
-				$op2 = array_pop($formulaStrings);
-				$op1 = array_pop($formulaStrings);
-				$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
-				unset($space0, $space1);
-				break;
-			case 'tUplus': // unary plus
-			case 'tUminus': // unary minus
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$space1$space0{$token['data']}$op";
-				unset($space0, $space1);
-				break;
-			case 'tPercent': // percent sign
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$op$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tAttrVolatile': // indicates volatile function
-			case 'tAttrIf':
-			case 'tAttrSkip':
-			case 'tAttrChoose':
-				// token is only important for Excel formula evaluator
-				// do nothing
-				break;
-			case 'tAttrSpace': // space / carriage return
-				// space will be used when next token arrives, do not alter formulaString stack
-				switch ($token['data']['spacetype']) {
-				case 'type0':
-					$space0 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type1':
-					$space1 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type2':
-					$space2 = str_repeat(' ', $token['data']['spacecount']);
+				case 'tAdd': // addition
+				case 'tConcat': // addition
+				case 'tDiv': // division
+				case 'tEQ': // equality
+				case 'tGE': // greater than or equal
+				case 'tGT': // greater than
+				case 'tIsect': // intersection
+				case 'tLE': // less than or equal
+				case 'tList': // less than or equal
+				case 'tLT': // less than
+				case 'tMul': // multiplication
+				case 'tNE': // multiplication
+				case 'tPower': // power
+				case 'tRange': // range
+				case 'tSub': // subtraction
+					$op2 = array_pop($formulaStrings);
+					$op1 = array_pop($formulaStrings);
+					$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
+					unset($space0, $space1);
 					break;
-				case 'type3':
-					$space3 = str_repeat("\n", $token['data']['spacecount']);
+				case 'tUplus': // unary plus
+				case 'tUminus': // unary minus
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "$space1$space0{$token['data']}$op";
+					unset($space0, $space1);
 					break;
-				case 'type4':
-					$space4 = str_repeat(' ', $token['data']['spacecount']);
+				case 'tPercent': // percent sign
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "$op$space1$space0{$token['data']}";
+					unset($space0, $space1);
 					break;
-				case 'type5':
-					$space5 = str_repeat("\n", $token['data']['spacecount']);
+				case 'tAttrVolatile': // indicates volatile function
+				case 'tAttrIf':
+				case 'tAttrSkip':
+				case 'tAttrChoose':
+					// token is only important for Excel formula evaluator
+					// do nothing
 					break;
-				}
-				break;
-			case 'tAttrSum': // SUM function with one parameter
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "{$space1}{$space0}SUM($op)";
-				unset($space0, $space1);
-				break;
-			case 'tFunc': // function with fixed number of arguments
-			case 'tFuncV': // function with variable number of arguments
-				if ($token['data']['function'] != '') {
-					// normal function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args']; ++$i) {
-						$ops[] = array_pop($formulaStrings);
+				case 'tAttrSpace': // space / carriage return
+					// space will be used when next token arrives, do not alter formulaString stack
+					switch ($token['data']['spacetype']) {
+						case 'type0':
+							$space0 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type1':
+							$space1 = str_repeat("\n", $token['data']['spacecount']);
+							break;
+						case 'type2':
+							$space2 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type3':
+							$space3 = str_repeat("\n", $token['data']['spacecount']);
+							break;
+						case 'type4':
+							$space4 = str_repeat(' ', $token['data']['spacecount']);
+							break;
+						case 'type5':
+							$space5 = str_repeat("\n", $token['data']['spacecount']);
+							break;
 					}
-					$ops = array_reverse($ops);
-					$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+				break;
+				case 'tAttrSum': // SUM function with one parameter
+					$op = array_pop($formulaStrings);
+					$formulaStrings[] = "{$space1}{$space0}SUM($op)";
 					unset($space0, $space1);
-				} else {
-					// add-in function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
-						$ops[] = array_pop($formulaStrings);
+					break;
+				case 'tFunc': // function with fixed number of arguments
+				case 'tFuncV': // function with variable number of arguments
+					if ($token['data']['function'] != '') {
+						// normal function
+						$ops = array(); // array of operators
+						for ($i = 0; $i < $token['data']['args']; ++$i) {
+							$ops[] = array_pop($formulaStrings);
+						}
+						$ops = array_reverse($ops);
+						$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+						unset($space0, $space1);
+					} else {
+						// add-in function
+						$ops = array(); // array of operators
+						for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
+							$ops[] = array_pop($formulaStrings);
+						}
+						$ops = array_reverse($ops);
+						$function = array_pop($formulaStrings);
+						$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+						unset($space0, $space1);
 					}
-					$ops = array_reverse($ops);
-					$function = array_pop($formulaStrings);
-					$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+					break;
+				case 'tParen': // parenthesis
+					$expression = array_pop($formulaStrings);
+					$formulaStrings[] = "$space3$space2($expression$space5$space4)";
+					unset($space2, $space3, $space4, $space5);
+					break;
+				case 'tArray': // array constant
+					$constantArray = self::_readBIFF8ConstantArray($additionalData);
+					$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+					$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
 					unset($space0, $space1);
-				}
-				break;
-			case 'tParen': // parenthesis
-				$expression = array_pop($formulaStrings);
-				$formulaStrings[] = "$space3$space2($expression$space5$space4)";
-				unset($space2, $space3, $space4, $space5);
-				break;
-			case 'tArray': // array constant
-				$constantArray = self::_readBIFF8ConstantArray($additionalData);
-				$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
-				$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
-				unset($space0, $space1);
-				break;
-			case 'tMemArea':
-				// bite off chunk of additional data
-				$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
-				$additionalData = substr($additionalData, $cellRangeAddressList['size']);
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tArea': // cell range address
-			case 'tBool': // boolean
-			case 'tErr': // error code
-			case 'tInt': // integer
-			case 'tMemErr':
-			case 'tMemFunc':
-			case 'tMissArg':
-			case 'tName':
-			case 'tNameX':
-			case 'tNum': // number
-			case 'tRef': // single cell reference
-			case 'tRef3d': // 3d cell reference
-			case 'tArea3d': // 3d cell range reference
-			case 'tRefN':
-			case 'tAreaN':
-			case 'tStr': // string
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
+					break;
+				case 'tMemArea':
+					// bite off chunk of additional data
+					$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
+					$additionalData = substr($additionalData, $cellRangeAddressList['size']);
+					$formulaStrings[] = "$space1$space0{$token['data']}";
+					unset($space0, $space1);
+					break;
+				case 'tArea': // cell range address
+				case 'tBool': // boolean
+				case 'tErr': // error code
+				case 'tInt': // integer
+				case 'tMemErr':
+				case 'tMemFunc':
+				case 'tMissArg':
+				case 'tName':
+				case 'tNameX':
+				case 'tNum': // number
+				case 'tRef': // single cell reference
+				case 'tRef3d': // 3d cell reference
+				case 'tArea3d': // 3d cell range reference
+				case 'tRefN':
+				case 'tAreaN':
+				case 'tStr': // string
+					$formulaStrings[] = "$space1$space0{$token['data']}";
+					unset($space0, $space1);
+					break;
 			}
 		}
 		$formulaString = $formulaStrings[0];
@@ -5253,546 +5253,546 @@ 
 		$name = false; // initialize token name
 
 		switch ($id) {
-		case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
-		case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
-		case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
-		case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
-		case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
-		case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
-		case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
-		case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
-		case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
-		case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
-		case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
-		case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
-		case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
-		case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
-		case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
-		case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
-		case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
-		case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
-		case 0x15:	//	parenthesis
-			$name  = 'tParen';
-			$size  = 1;
-			$data = null;
-			break;
-		case 0x16:	//	missing argument
-			$name = 'tMissArg';
-			$size = 1;
-			$data = '';
-			break;
-		case 0x17:	//	string
-			$name = 'tStr';
-			// offset: 1; size: var; Unicode string, 8-bit string length
-			$string = self::_readUnicodeStringShort(substr($formulaData, 1));
-			$size = 1 + $string['size'];
-			$data = self::_UTF8toExcelDoubleQuoted($string['value']);
-			break;
-		case 0x19:	//	Special attribute
-			// offset: 1; size: 1; attribute type flags:
-			switch (ord($formulaData[1])) {
-			case 0x01:
-				$name = 'tAttrVolatile';
-				$size = 4;
+			case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
+			case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
+			case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
+			case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
+			case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
+			case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
+			case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
+			case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
+			case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
+			case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
+			case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
+			case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
+			case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
+			case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
+			case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
+			case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
+			case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
+			case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
+			case 0x15:	//	parenthesis
+				$name  = 'tParen';
+				$size  = 1;
 				$data = null;
 				break;
-			case 0x02:
-				$name = 'tAttrIf';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x04:
-				$name = 'tAttrChoose';
-				// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
-				$nc = self::_GetInt2d($formulaData, 2);
-				// offset: 4; size: 2 * $nc
-				// offset: 4 + 2 * $nc; size: 2
-				$size = 2 * $nc + 6;
-				$data = null;
+			case 0x16:	//	missing argument
+				$name = 'tMissArg';
+				$size = 1;
+				$data = '';
 				break;
-			case 0x08:
-				$name = 'tAttrSkip';
-				$size = 4;
-				$data = null;
+			case 0x17:	//	string
+				$name = 'tStr';
+				// offset: 1; size: var; Unicode string, 8-bit string length
+				$string = self::_readUnicodeStringShort(substr($formulaData, 1));
+				$size = 1 + $string['size'];
+				$data = self::_UTF8toExcelDoubleQuoted($string['value']);
 				break;
-			case 0x10:
-				$name = 'tAttrSum';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x40:
-			case 0x41:
-				$name = 'tAttrSpace';
-				$size = 4;
-				// offset: 2; size: 2; space type and position
-				switch (ord($formulaData[2])) {
-				case 0x00:
-					$spacetype = 'type0';
-					break;
-				case 0x01:
-					$spacetype = 'type1';
-					break;
-				case 0x02:
-					$spacetype = 'type2';
-					break;
-				case 0x03:
-					$spacetype = 'type3';
-					break;
-				case 0x04:
-					$spacetype = 'type4';
-					break;
-				case 0x05:
-					$spacetype = 'type5';
-					break;
-				default:
-					throw new Exception('Unrecognized space type in tAttrSpace token');
-					break;
-				}
-				// offset: 3; size: 1; number of inserted spaces/carriage returns
-				$spacecount = ord($formulaData[3]);
+			case 0x19:	//	Special attribute
+				// offset: 1; size: 1; attribute type flags:
+				switch (ord($formulaData[1])) {
+					case 0x01:
+						$name = 'tAttrVolatile';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x02:
+						$name = 'tAttrIf';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x04:
+						$name = 'tAttrChoose';
+						// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
+						$nc = self::_GetInt2d($formulaData, 2);
+						// offset: 4; size: 2 * $nc
+						// offset: 4 + 2 * $nc; size: 2
+						$size = 2 * $nc + 6;
+						$data = null;
+						break;
+					case 0x08:
+						$name = 'tAttrSkip';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x10:
+						$name = 'tAttrSum';
+						$size = 4;
+						$data = null;
+						break;
+					case 0x40:
+					case 0x41:
+						$name = 'tAttrSpace';
+						$size = 4;
+						// offset: 2; size: 2; space type and position
+						switch (ord($formulaData[2])) {
+							case 0x00:
+								$spacetype = 'type0';
+								break;
+							case 0x01:
+								$spacetype = 'type1';
+								break;
+							case 0x02:
+								$spacetype = 'type2';
+								break;
+							case 0x03:
+								$spacetype = 'type3';
+								break;
+							case 0x04:
+								$spacetype = 'type4';
+								break;
+							case 0x05:
+								$spacetype = 'type5';
+								break;
+							default:
+								throw new Exception('Unrecognized space type in tAttrSpace token');
+								break;
+						}
+					// offset: 3; size: 1; number of inserted spaces/carriage returns
+					$spacecount = ord($formulaData[3]);
 
-				$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
-				break;
+					$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
+					break;
 			default:
 				throw new Exception('Unrecognized attribute flag in tAttr token');
 				break;
 			}
 			break;
-		case 0x1C:	//	error code
-			// offset: 1; size: 1; error code
-			$name = 'tErr';
-			$size = 2;
-			$data = self::_mapErrorCode(ord($formulaData[1]));
-			break;
-		case 0x1D:	//	boolean
-			// offset: 1; size: 1; 0 = false, 1 = true;
-			$name = 'tBool';
-			$size = 2;
-			$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
-			break;
-		case 0x1E:	//	integer
-			// offset: 1; size: 2; unsigned 16-bit integer
-			$name = 'tInt';
-			$size = 3;
-			$data = self::_GetInt2d($formulaData, 1);
-			break;
-		case 0x1F:	//	number
-			// offset: 1; size: 8;
-			$name = 'tNum';
-			$size = 9;
-			$data = self::_extractNumber(substr($formulaData, 1));
-			$data = str_replace(',', '.', (string)$data); // in case non-English locale
-			break;
-		case 0x20:	//	array constant
-		case 0x40:
-		case 0x60:
-			// offset: 1; size: 7; not used
-			$name = 'tArray';
-			$size = 8;
-			$data = null;
-			break;
-		case 0x21:	//	function with fixed number of arguments
-		case 0x41:
-		case 0x61:
-			$name = 'tFunc';
-			$size = 3;
-			// offset: 1; size: 2; index to built-in sheet function
-			switch (self::_GetInt2d($formulaData, 1)) {
-			case   2: $function = 'ISNA'; 			$args = 1; 	break;
-			case   3: $function = 'ISERROR'; 		$args = 1; 	break;
-			case  10: $function = 'NA'; 			$args = 0; 	break;
-			case  15: $function = 'SIN'; 			$args = 1; 	break;
-			case  16: $function = 'COS'; 			$args = 1; 	break;
-			case  17: $function = 'TAN'; 			$args = 1; 	break;
-			case  18: $function = 'ATAN'; 			$args = 1; 	break;
-			case  19: $function = 'PI'; 			$args = 0; 	break;
-			case  20: $function = 'SQRT'; 			$args = 1; 	break;
-			case  21: $function = 'EXP'; 			$args = 1; 	break;
-			case  22: $function = 'LN'; 			$args = 1; 	break;
-			case  23: $function = 'LOG10'; 			$args = 1; 	break;
-			case  24: $function = 'ABS'; 			$args = 1; 	break;
-			case  25: $function = 'INT'; 			$args = 1; 	break;
-			case  26: $function = 'SIGN'; 			$args = 1; 	break;
-			case  27: $function = 'ROUND'; 			$args = 2; 	break;
-			case  30: $function = 'REPT'; 			$args = 2; 	break;
-			case  31: $function = 'MID'; 			$args = 3; 	break;
-			case  32: $function = 'LEN'; 			$args = 1; 	break;
-			case  33: $function = 'VALUE'; 			$args = 1; 	break;
-			case  34: $function = 'TRUE'; 			$args = 0; 	break;
-			case  35: $function = 'FALSE'; 			$args = 0; 	break;
-			case  38: $function = 'NOT'; 			$args = 1; 	break;
-			case  39: $function = 'MOD'; 			$args = 2;	break;
-			case  40: $function = 'DCOUNT'; 		$args = 3;	break;
-			case  41: $function = 'DSUM'; 			$args = 3;	break;
-			case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
-			case  43: $function = 'DMIN'; 			$args = 3;	break;
-			case  44: $function = 'DMAX'; 			$args = 3;	break;
-			case  45: $function = 'DSTDEV'; 		$args = 3;	break;
-			case  48: $function = 'TEXT'; 			$args = 2;	break;
-			case  61: $function = 'MIRR'; 			$args = 3;	break;
-			case  63: $function = 'RAND'; 			$args = 0;	break;
-			case  65: $function = 'DATE'; 			$args = 3;	break;
-			case  66: $function = 'TIME'; 			$args = 3;	break;
-			case  67: $function = 'DAY'; 			$args = 1;	break;
-			case  68: $function = 'MONTH'; 			$args = 1;	break;
-			case  69: $function = 'YEAR'; 			$args = 1;	break;
-			case  71: $function = 'HOUR'; 			$args = 1;	break;
-			case  72: $function = 'MINUTE'; 		$args = 1;	break;
-			case  73: $function = 'SECOND'; 		$args = 1;	break;
-			case  74: $function = 'NOW'; 			$args = 0;	break;
-			case  75: $function = 'AREAS'; 			$args = 1;	break;
-			case  76: $function = 'ROWS'; 			$args = 1;	break;
-			case  77: $function = 'COLUMNS'; 		$args = 1;	break;
-			case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
-			case  86: $function = 'TYPE'; 			$args = 1;	break;
-			case  97: $function = 'ATAN2'; 			$args = 2;	break;
-			case  98: $function = 'ASIN'; 			$args = 1;	break;
-			case  99: $function = 'ACOS'; 			$args = 1;	break;
-			case 105: $function = 'ISREF'; 			$args = 1;	break;
-			case 111: $function = 'CHAR'; 			$args = 1;	break;
-			case 112: $function = 'LOWER'; 			$args = 1;	break;
-			case 113: $function = 'UPPER'; 			$args = 1;	break;
-			case 114: $function = 'PROPER'; 		$args = 1;	break;
-			case 117: $function = 'EXACT'; 			$args = 2;	break;
-			case 118: $function = 'TRIM'; 			$args = 1;	break;
-			case 119: $function = 'REPLACE'; 		$args = 4;	break;
-			case 121: $function = 'CODE'; 			$args = 1;	break;
-			case 126: $function = 'ISERR'; 			$args = 1;	break;
-			case 127: $function = 'ISTEXT'; 		$args = 1;	break;
-			case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
-			case 129: $function = 'ISBLANK'; 		$args = 1;	break;
-			case 130: $function = 'T'; 				$args = 1;	break;
-			case 131: $function = 'N'; 				$args = 1;	break;
-			case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
-			case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
-			case 142: $function = 'SLN'; 			$args = 3;	break;
-			case 143: $function = 'SYD'; 			$args = 4;	break;
-			case 162: $function = 'CLEAN'; 			$args = 1;	break;
-			case 163: $function = 'MDETERM'; 		$args = 1;	break;
-			case 164: $function = 'MINVERSE'; 		$args = 1;	break;
-			case 165: $function = 'MMULT'; 			$args = 2;	break;
-			case 184: $function = 'FACT'; 			$args = 1;	break;
-			case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
-			case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
-			case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
-			case 196: $function = 'DVARP'; 			$args = 3;	break;
-			case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
-			case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
-			case 207: $function = 'REPLACEB'; 		$args = 4;	break;
-			case 210: $function = 'MIDB'; 			$args = 3;	break;
-			case 211: $function = 'LENB'; 			$args = 1;	break;
-			case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
-			case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
-			case 214: $function = 'ASC'; 			$args = 1;	break;
-			case 215: $function = 'DBCS'; 			$args = 1;	break;
-			case 221: $function = 'TODAY'; 			$args = 0;	break;
-			case 229: $function = 'SINH'; 			$args = 1;	break;
-			case 230: $function = 'COSH'; 			$args = 1;	break;
-			case 231: $function = 'TANH'; 			$args = 1;	break;
-			case 232: $function = 'ASINH'; 			$args = 1;	break;
-			case 233: $function = 'ACOSH'; 			$args = 1;	break;
-			case 234: $function = 'ATANH'; 			$args = 1;	break;
-			case 235: $function = 'DGET'; 			$args = 3;	break;
-			case 244: $function = 'INFO'; 			$args = 1;	break;
-			case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
-			case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
-			case 271: $function = 'GAMMALN'; 		$args = 1;	break;
-			case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
-			case 274: $function = 'CHIDIST'; 		$args = 2;	break;
-			case 275: $function = 'CHIINV'; 		$args = 2;	break;
-			case 276: $function = 'COMBIN'; 		$args = 2;	break;
-			case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
-			case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
-			case 279: $function = 'EVEN'; 			$args = 1;	break;
-			case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
-			case 281: $function = 'FDIST'; 			$args = 3;	break;
-			case 282: $function = 'FINV'; 			$args = 3;	break;
-			case 283: $function = 'FISHER'; 		$args = 1;	break;
-			case 284: $function = 'FISHERINV'; 		$args = 1;	break;
-			case 285: $function = 'FLOOR'; 			$args = 2;	break;
-			case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
-			case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
-			case 288: $function = 'CEILING'; 		$args = 2;	break;
-			case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
-			case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
-			case 291: $function = 'LOGINV';			$args = 3;	break;
-			case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
-			case 293: $function = 'NORMDIST';		$args = 4;	break;
-			case 294: $function = 'NORMSDIST';		$args = 1;	break;
-			case 295: $function = 'NORMINV';		$args = 3;	break;
-			case 296: $function = 'NORMSINV';		$args = 1;	break;
-			case 297: $function = 'STANDARDIZE';	$args = 3;	break;
-			case 298: $function = 'ODD';			$args = 1;	break;
-			case 299: $function = 'PERMUT';			$args = 2;	break;
-			case 300: $function = 'POISSON';		$args = 3;	break;
-			case 301: $function = 'TDIST';			$args = 3;	break;
-			case 302: $function = 'WEIBULL';		$args = 4;	break;
-			case 303: $function = 'SUMXMY2';		$args = 2;	break;
-			case 304: $function = 'SUMX2MY2';		$args = 2;	break;
-			case 305: $function = 'SUMX2PY2';		$args = 2;	break;
-			case 306: $function = 'CHITEST';		$args = 2;	break;
-			case 307: $function = 'CORREL';			$args = 2;	break;
-			case 308: $function = 'COVAR';			$args = 2;	break;
-			case 309: $function = 'FORECAST';		$args = 3;	break;
-			case 310: $function = 'FTEST';			$args = 2;	break;
-			case 311: $function = 'INTERCEPT';		$args = 2;	break;
-			case 312: $function = 'PEARSON';		$args = 2;	break;
-			case 313: $function = 'RSQ';			$args = 2;	break;
-			case 314: $function = 'STEYX';			$args = 2;	break;
-			case 315: $function = 'SLOPE';			$args = 2;	break;
-			case 316: $function = 'TTEST';			$args = 4;	break;
-			case 325: $function = 'LARGE';			$args = 2;	break;
-			case 326: $function = 'SMALL';			$args = 2;	break;
-			case 327: $function = 'QUARTILE';		$args = 2;	break;
-			case 328: $function = 'PERCENTILE';		$args = 2;	break;
-			case 331: $function = 'TRIMMEAN';		$args = 2;	break;
-			case 332: $function = 'TINV';			$args = 2;	break;
-			case 337: $function = 'POWER';			$args = 2;	break;
-			case 342: $function = 'RADIANS';		$args = 1;	break;
-			case 343: $function = 'DEGREES';		$args = 1;	break;
-			case 346: $function = 'COUNTIF';		$args = 2;	break;
-			case 347: $function = 'COUNTBLANK';		$args = 1;	break;
-			case 350: $function = 'ISPMT';			$args = 4;	break;
-			case 351: $function = 'DATEDIF';		$args = 3;	break;
-			case 352: $function = 'DATESTRING';		$args = 1;	break;
-			case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
-			case 360: $function = 'PHONETIC';		$args = 1;	break;
-			case 368: $function = 'BAHTTEXT';		$args = 1;	break;
-			default:
-				throw new Exception('Unrecognized function in formula');
+			case 0x1C:	//	error code
+				// offset: 1; size: 1; error code
+				$name = 'tErr';
+				$size = 2;
+				$data = self::_mapErrorCode(ord($formulaData[1]));
 				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x22:	//	function with variable number of arguments
-		case 0x42:
-		case 0x62:
-			$name = 'tFuncV';
-			$size = 4;
-			// offset: 1; size: 1; number of arguments
-			$args = ord($formulaData[1]);
-			// offset: 2: size: 2; index to built-in sheet function
-			$index = self::_GetInt2d($formulaData, 2);
-			switch ($index) {
-			case   0: $function = 'COUNT';			break;
-			case   1: $function = 'IF';				break;
-			case   4: $function = 'SUM';			break;
-			case   5: $function = 'AVERAGE';		break;
-			case   6: $function = 'MIN';			break;
-			case   7: $function = 'MAX';			break;
-			case   8: $function = 'ROW';			break;
-			case   9: $function = 'COLUMN';			break;
-			case  11: $function = 'NPV';			break;
-			case  12: $function = 'STDEV';			break;
-			case  13: $function = 'DOLLAR';			break;
-			case  14: $function = 'FIXED';			break;
-			case  28: $function = 'LOOKUP';			break;
-			case  29: $function = 'INDEX';			break;
-			case  36: $function = 'AND';			break;
-			case  37: $function = 'OR';				break;
-			case  46: $function = 'VAR';			break;
-			case  49: $function = 'LINEST';			break;
-			case  50: $function = 'TREND';			break;
-			case  51: $function = 'LOGEST';			break;
-			case  52: $function = 'GROWTH';			break;
-			case  56: $function = 'PV';				break;
-			case  57: $function = 'FV';				break;
-			case  58: $function = 'NPER';			break;
-			case  59: $function = 'PMT';			break;
-			case  60: $function = 'RATE';			break;
-			case  62: $function = 'IRR';			break;
-			case  64: $function = 'MATCH';			break;
-			case  70: $function = 'WEEKDAY';		break;
-			case  78: $function = 'OFFSET';			break;
-			case  82: $function = 'SEARCH';			break;
-			case 100: $function = 'CHOOSE';			break;
-			case 101: $function = 'HLOOKUP';		break;
-			case 102: $function = 'VLOOKUP';		break;
-			case 109: $function = 'LOG';			break;
-			case 115: $function = 'LEFT';			break;
-			case 116: $function = 'RIGHT';			break;
-			case 120: $function = 'SUBSTITUTE';		break;
-			case 124: $function = 'FIND';			break;
-			case 125: $function = 'CELL';			break;
-			case 144: $function = 'DDB';			break;
-			case 148: $function = 'INDIRECT';		break;
-			case 167: $function = 'IPMT';			break;
-			case 168: $function = 'PPMT';			break;
-			case 169: $function = 'COUNTA';			break;
-			case 183: $function = 'PRODUCT';		break;
-			case 193: $function = 'STDEVP';			break;
-			case 194: $function = 'VARP';			break;
-			case 197: $function = 'TRUNC';			break;
-			case 204: $function = 'USDOLLAR';		break;
-			case 205: $function = 'FINDB';			break;
-			case 206: $function = 'SEARCHB';		break;
-			case 208: $function = 'LEFTB';			break;
-			case 209: $function = 'RIGHTB';			break;
-			case 216: $function = 'RANK';			break;
-			case 219: $function = 'ADDRESS';		break;
-			case 220: $function = 'DAYS360';		break;
-			case 222: $function = 'VDB';			break;
-			case 227: $function = 'MEDIAN';			break;
-			case 228: $function = 'SUMPRODUCT';		break;
-			case 247: $function = 'DB';				break;
-			case 255: $function = '';				break;
-			case 269: $function = 'AVEDEV';			break;
-			case 270: $function = 'BETADIST';		break;
-			case 272: $function = 'BETAINV';		break;
-			case 317: $function = 'PROB';			break;
-			case 318: $function = 'DEVSQ';			break;
-			case 319: $function = 'GEOMEAN';		break;
-			case 320: $function = 'HARMEAN';		break;
-			case 321: $function = 'SUMSQ';			break;
-			case 322: $function = 'KURT';			break;
-			case 323: $function = 'SKEW';			break;
-			case 324: $function = 'ZTEST';			break;
-			case 329: $function = 'PERCENTRANK';	break;
-			case 330: $function = 'MODE';			break;
-			case 336: $function = 'CONCATENATE';	break;
-			case 344: $function = 'SUBTOTAL';		break;
-			case 345: $function = 'SUMIF';			break;
-			case 354: $function = 'ROMAN';			break;
-			case 358: $function = 'GETPIVOTDATA';	break;
-			case 359: $function = 'HYPERLINK';		break;
-			case 361: $function = 'AVERAGEA';		break;
-			case 362: $function = 'MAXA';			break;
-			case 363: $function = 'MINA';			break;
-			case 364: $function = 'STDEVPA';		break;
-			case 365: $function = 'VARPA';			break;
-			case 366: $function = 'STDEVA';			break;
-			case 367: $function = 'VARA';			break;
-			default:
-				throw new Exception('Unrecognized function in formula');
+			case 0x1D:	//	boolean
+				// offset: 1; size: 1; 0 = false, 1 = true;
+				$name = 'tBool';
+				$size = 2;
+				$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
 				break;
-			}
+			case 0x1E:	//	integer
+				// offset: 1; size: 2; unsigned 16-bit integer
+				$name = 'tInt';
+				$size = 3;
+				$data = self::_GetInt2d($formulaData, 1);
+				break;
+			case 0x1F:	//	number
+				// offset: 1; size: 8;
+				$name = 'tNum';
+				$size = 9;
+				$data = self::_extractNumber(substr($formulaData, 1));
+				$data = str_replace(',', '.', (string)$data); // in case non-English locale
+				break;
+			case 0x20:	//	array constant
+			case 0x40:
+			case 0x60:
+				// offset: 1; size: 7; not used
+				$name = 'tArray';
+				$size = 8;
+				$data = null;
+				break;
+			case 0x21:	//	function with fixed number of arguments
+			case 0x41:
+			case 0x61:
+				$name = 'tFunc';
+				$size = 3;
+				// offset: 1; size: 2; index to built-in sheet function
+				switch (self::_GetInt2d($formulaData, 1)) {
+					case   2: $function = 'ISNA'; 			$args = 1; 	break;
+					case   3: $function = 'ISERROR'; 		$args = 1; 	break;
+					case  10: $function = 'NA'; 			$args = 0; 	break;
+					case  15: $function = 'SIN'; 			$args = 1; 	break;
+					case  16: $function = 'COS'; 			$args = 1; 	break;
+					case  17: $function = 'TAN'; 			$args = 1; 	break;
+					case  18: $function = 'ATAN'; 			$args = 1; 	break;
+					case  19: $function = 'PI'; 			$args = 0; 	break;
+					case  20: $function = 'SQRT'; 			$args = 1; 	break;
+					case  21: $function = 'EXP'; 			$args = 1; 	break;
+					case  22: $function = 'LN'; 			$args = 1; 	break;
+					case  23: $function = 'LOG10'; 			$args = 1; 	break;
+					case  24: $function = 'ABS'; 			$args = 1; 	break;
+					case  25: $function = 'INT'; 			$args = 1; 	break;
+					case  26: $function = 'SIGN'; 			$args = 1; 	break;
+					case  27: $function = 'ROUND'; 			$args = 2; 	break;
+					case  30: $function = 'REPT'; 			$args = 2; 	break;
+					case  31: $function = 'MID'; 			$args = 3; 	break;
+					case  32: $function = 'LEN'; 			$args = 1; 	break;
+					case  33: $function = 'VALUE'; 			$args = 1; 	break;
+					case  34: $function = 'TRUE'; 			$args = 0; 	break;
+					case  35: $function = 'FALSE'; 			$args = 0; 	break;
+					case  38: $function = 'NOT'; 			$args = 1; 	break;
+					case  39: $function = 'MOD'; 			$args = 2;	break;
+					case  40: $function = 'DCOUNT'; 		$args = 3;	break;
+					case  41: $function = 'DSUM'; 			$args = 3;	break;
+					case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
+					case  43: $function = 'DMIN'; 			$args = 3;	break;
+					case  44: $function = 'DMAX'; 			$args = 3;	break;
+					case  45: $function = 'DSTDEV'; 		$args = 3;	break;
+					case  48: $function = 'TEXT'; 			$args = 2;	break;
+					case  61: $function = 'MIRR'; 			$args = 3;	break;
+					case  63: $function = 'RAND'; 			$args = 0;	break;
+					case  65: $function = 'DATE'; 			$args = 3;	break;
+					case  66: $function = 'TIME'; 			$args = 3;	break;
+					case  67: $function = 'DAY'; 			$args = 1;	break;
+					case  68: $function = 'MONTH'; 			$args = 1;	break;
+					case  69: $function = 'YEAR'; 			$args = 1;	break;
+					case  71: $function = 'HOUR'; 			$args = 1;	break;
+					case  72: $function = 'MINUTE'; 		$args = 1;	break;
+					case  73: $function = 'SECOND'; 		$args = 1;	break;
+					case  74: $function = 'NOW'; 			$args = 0;	break;
+					case  75: $function = 'AREAS'; 			$args = 1;	break;
+					case  76: $function = 'ROWS'; 			$args = 1;	break;
+					case  77: $function = 'COLUMNS'; 		$args = 1;	break;
+					case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
+					case  86: $function = 'TYPE'; 			$args = 1;	break;
+					case  97: $function = 'ATAN2'; 			$args = 2;	break;
+					case  98: $function = 'ASIN'; 			$args = 1;	break;
+					case  99: $function = 'ACOS'; 			$args = 1;	break;
+					case 105: $function = 'ISREF'; 			$args = 1;	break;
+					case 111: $function = 'CHAR'; 			$args = 1;	break;
+					case 112: $function = 'LOWER'; 			$args = 1;	break;
+					case 113: $function = 'UPPER'; 			$args = 1;	break;
+					case 114: $function = 'PROPER'; 		$args = 1;	break;
+					case 117: $function = 'EXACT'; 			$args = 2;	break;
+					case 118: $function = 'TRIM'; 			$args = 1;	break;
+					case 119: $function = 'REPLACE'; 		$args = 4;	break;
+					case 121: $function = 'CODE'; 			$args = 1;	break;
+					case 126: $function = 'ISERR'; 			$args = 1;	break;
+					case 127: $function = 'ISTEXT'; 		$args = 1;	break;
+					case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
+					case 129: $function = 'ISBLANK'; 		$args = 1;	break;
+					case 130: $function = 'T'; 				$args = 1;	break;
+					case 131: $function = 'N'; 				$args = 1;	break;
+					case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
+					case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
+					case 142: $function = 'SLN'; 			$args = 3;	break;
+					case 143: $function = 'SYD'; 			$args = 4;	break;
+					case 162: $function = 'CLEAN'; 			$args = 1;	break;
+					case 163: $function = 'MDETERM'; 		$args = 1;	break;
+					case 164: $function = 'MINVERSE'; 		$args = 1;	break;
+					case 165: $function = 'MMULT'; 			$args = 2;	break;
+					case 184: $function = 'FACT'; 			$args = 1;	break;
+					case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
+					case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
+					case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
+					case 196: $function = 'DVARP'; 			$args = 3;	break;
+					case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
+					case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
+					case 207: $function = 'REPLACEB'; 		$args = 4;	break;
+					case 210: $function = 'MIDB'; 			$args = 3;	break;
+					case 211: $function = 'LENB'; 			$args = 1;	break;
+					case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
+					case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
+					case 214: $function = 'ASC'; 			$args = 1;	break;
+					case 215: $function = 'DBCS'; 			$args = 1;	break;
+					case 221: $function = 'TODAY'; 			$args = 0;	break;
+					case 229: $function = 'SINH'; 			$args = 1;	break;
+					case 230: $function = 'COSH'; 			$args = 1;	break;
+					case 231: $function = 'TANH'; 			$args = 1;	break;
+					case 232: $function = 'ASINH'; 			$args = 1;	break;
+					case 233: $function = 'ACOSH'; 			$args = 1;	break;
+					case 234: $function = 'ATANH'; 			$args = 1;	break;
+					case 235: $function = 'DGET'; 			$args = 3;	break;
+					case 244: $function = 'INFO'; 			$args = 1;	break;
+					case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
+					case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
+					case 271: $function = 'GAMMALN'; 		$args = 1;	break;
+					case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
+					case 274: $function = 'CHIDIST'; 		$args = 2;	break;
+					case 275: $function = 'CHIINV'; 		$args = 2;	break;
+					case 276: $function = 'COMBIN'; 		$args = 2;	break;
+					case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
+					case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
+					case 279: $function = 'EVEN'; 			$args = 1;	break;
+					case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
+					case 281: $function = 'FDIST'; 			$args = 3;	break;
+					case 282: $function = 'FINV'; 			$args = 3;	break;
+					case 283: $function = 'FISHER'; 		$args = 1;	break;
+					case 284: $function = 'FISHERINV'; 		$args = 1;	break;
+					case 285: $function = 'FLOOR'; 			$args = 2;	break;
+					case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
+					case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
+					case 288: $function = 'CEILING'; 		$args = 2;	break;
+					case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
+					case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
+					case 291: $function = 'LOGINV';			$args = 3;	break;
+					case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
+					case 293: $function = 'NORMDIST';		$args = 4;	break;
+					case 294: $function = 'NORMSDIST';		$args = 1;	break;
+					case 295: $function = 'NORMINV';		$args = 3;	break;
+					case 296: $function = 'NORMSINV';		$args = 1;	break;
+					case 297: $function = 'STANDARDIZE';	$args = 3;	break;
+					case 298: $function = 'ODD';			$args = 1;	break;
+					case 299: $function = 'PERMUT';			$args = 2;	break;
+					case 300: $function = 'POISSON';		$args = 3;	break;
+					case 301: $function = 'TDIST';			$args = 3;	break;
+					case 302: $function = 'WEIBULL';		$args = 4;	break;
+					case 303: $function = 'SUMXMY2';		$args = 2;	break;
+					case 304: $function = 'SUMX2MY2';		$args = 2;	break;
+					case 305: $function = 'SUMX2PY2';		$args = 2;	break;
+					case 306: $function = 'CHITEST';		$args = 2;	break;
+					case 307: $function = 'CORREL';			$args = 2;	break;
+					case 308: $function = 'COVAR';			$args = 2;	break;
+					case 309: $function = 'FORECAST';		$args = 3;	break;
+					case 310: $function = 'FTEST';			$args = 2;	break;
+					case 311: $function = 'INTERCEPT';		$args = 2;	break;
+					case 312: $function = 'PEARSON';		$args = 2;	break;
+					case 313: $function = 'RSQ';			$args = 2;	break;
+					case 314: $function = 'STEYX';			$args = 2;	break;
+					case 315: $function = 'SLOPE';			$args = 2;	break;
+					case 316: $function = 'TTEST';			$args = 4;	break;
+					case 325: $function = 'LARGE';			$args = 2;	break;
+					case 326: $function = 'SMALL';			$args = 2;	break;
+					case 327: $function = 'QUARTILE';		$args = 2;	break;
+					case 328: $function = 'PERCENTILE';		$args = 2;	break;
+					case 331: $function = 'TRIMMEAN';		$args = 2;	break;
+					case 332: $function = 'TINV';			$args = 2;	break;
+					case 337: $function = 'POWER';			$args = 2;	break;
+					case 342: $function = 'RADIANS';		$args = 1;	break;
+					case 343: $function = 'DEGREES';		$args = 1;	break;
+					case 346: $function = 'COUNTIF';		$args = 2;	break;
+					case 347: $function = 'COUNTBLANK';		$args = 1;	break;
+					case 350: $function = 'ISPMT';			$args = 4;	break;
+					case 351: $function = 'DATEDIF';		$args = 3;	break;
+					case 352: $function = 'DATESTRING';		$args = 1;	break;
+					case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
+					case 360: $function = 'PHONETIC';		$args = 1;	break;
+					case 368: $function = 'BAHTTEXT';		$args = 1;	break;
+					default:
+						throw new Exception('Unrecognized function in formula');
+						break;
+				}
 			$data = array('function' => $function, 'args' => $args);
 			break;
-		case 0x23:	//	index to defined name
-		case 0x43:
-		case 0x63:
-			$name = 'tName';
-			$size = 5;
-			// offset: 1; size: 2; one-based index to definedname record
-			$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
-			// offset: 2; size: 2; not used
-			$data = $this->_definedname[$definedNameIndex]['name'];
-			break;
-		case 0x24:	//	single cell reference e.g. A5
-		case 0x44:
-		case 0x64:
-			$name = 'tRef';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
-			break;
-		case 0x25:	//	cell range reference to cells in the same sheet (2d)
-		case 0x45:
-		case 0x65:
-			$name = 'tArea';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
-			break;
-		case 0x26:	//	Constant reference sub-expression
-		case 0x46:
-		case 0x66:
-			$name = 'tMemArea';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x27:	//	Deleted constant reference sub-expression
-		case 0x47:
-		case 0x67:
-			$name = 'tMemErr';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x29:	//	Variable reference sub-expression
-		case 0x49:
-		case 0x69:
-			$name = 'tMemFunc';
-			// offset: 1; size: 2; size of the following sub-expression
-			$subSize = self::_GetInt2d($formulaData, 1);
-			$size = 3 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
+			case 0x22:	//	function with variable number of arguments
+			case 0x42:
+			case 0x62:
+				$name = 'tFuncV';
+				$size = 4;
+				// offset: 1; size: 1; number of arguments
+				$args = ord($formulaData[1]);
+				// offset: 2: size: 2; index to built-in sheet function
+				$index = self::_GetInt2d($formulaData, 2);
+				switch ($index) {
+					case   0: $function = 'COUNT';			break;
+					case   1: $function = 'IF';				break;
+					case   4: $function = 'SUM';			break;
+					case   5: $function = 'AVERAGE';		break;
+					case   6: $function = 'MIN';			break;
+					case   7: $function = 'MAX';			break;
+					case   8: $function = 'ROW';			break;
+					case   9: $function = 'COLUMN';			break;
+					case  11: $function = 'NPV';			break;
+					case  12: $function = 'STDEV';			break;
+					case  13: $function = 'DOLLAR';			break;
+					case  14: $function = 'FIXED';			break;
+					case  28: $function = 'LOOKUP';			break;
+					case  29: $function = 'INDEX';			break;
+					case  36: $function = 'AND';			break;
+					case  37: $function = 'OR';				break;
+					case  46: $function = 'VAR';			break;
+					case  49: $function = 'LINEST';			break;
+					case  50: $function = 'TREND';			break;
+					case  51: $function = 'LOGEST';			break;
+					case  52: $function = 'GROWTH';			break;
+					case  56: $function = 'PV';				break;
+					case  57: $function = 'FV';				break;
+					case  58: $function = 'NPER';			break;
+					case  59: $function = 'PMT';			break;
+					case  60: $function = 'RATE';			break;
+					case  62: $function = 'IRR';			break;
+					case  64: $function = 'MATCH';			break;
+					case  70: $function = 'WEEKDAY';		break;
+					case  78: $function = 'OFFSET';			break;
+					case  82: $function = 'SEARCH';			break;
+					case 100: $function = 'CHOOSE';			break;
+					case 101: $function = 'HLOOKUP';		break;
+					case 102: $function = 'VLOOKUP';		break;
+					case 109: $function = 'LOG';			break;
+					case 115: $function = 'LEFT';			break;
+					case 116: $function = 'RIGHT';			break;
+					case 120: $function = 'SUBSTITUTE';		break;
+					case 124: $function = 'FIND';			break;
+					case 125: $function = 'CELL';			break;
+					case 144: $function = 'DDB';			break;
+					case 148: $function = 'INDIRECT';		break;
+					case 167: $function = 'IPMT';			break;
+					case 168: $function = 'PPMT';			break;
+					case 169: $function = 'COUNTA';			break;
+					case 183: $function = 'PRODUCT';		break;
+					case 193: $function = 'STDEVP';			break;
+					case 194: $function = 'VARP';			break;
+					case 197: $function = 'TRUNC';			break;
+					case 204: $function = 'USDOLLAR';		break;
+					case 205: $function = 'FINDB';			break;
+					case 206: $function = 'SEARCHB';		break;
+					case 208: $function = 'LEFTB';			break;
+					case 209: $function = 'RIGHTB';			break;
+					case 216: $function = 'RANK';			break;
+					case 219: $function = 'ADDRESS';		break;
+					case 220: $function = 'DAYS360';		break;
+					case 222: $function = 'VDB';			break;
+					case 227: $function = 'MEDIAN';			break;
+					case 228: $function = 'SUMPRODUCT';		break;
+					case 247: $function = 'DB';				break;
+					case 255: $function = '';				break;
+					case 269: $function = 'AVEDEV';			break;
+					case 270: $function = 'BETADIST';		break;
+					case 272: $function = 'BETAINV';		break;
+					case 317: $function = 'PROB';			break;
+					case 318: $function = 'DEVSQ';			break;
+					case 319: $function = 'GEOMEAN';		break;
+					case 320: $function = 'HARMEAN';		break;
+					case 321: $function = 'SUMSQ';			break;
+					case 322: $function = 'KURT';			break;
+					case 323: $function = 'SKEW';			break;
+					case 324: $function = 'ZTEST';			break;
+					case 329: $function = 'PERCENTRANK';	break;
+					case 330: $function = 'MODE';			break;
+					case 336: $function = 'CONCATENATE';	break;
+					case 344: $function = 'SUBTOTAL';		break;
+					case 345: $function = 'SUMIF';			break;
+					case 354: $function = 'ROMAN';			break;
+					case 358: $function = 'GETPIVOTDATA';	break;
+					case 359: $function = 'HYPERLINK';		break;
+					case 361: $function = 'AVERAGEA';		break;
+					case 362: $function = 'MAXA';			break;
+					case 363: $function = 'MINA';			break;
+					case 364: $function = 'STDEVPA';		break;
+					case 365: $function = 'VARPA';			break;
+					case 366: $function = 'STDEVA';			break;
+					case 367: $function = 'VARA';			break;
+					default:
+						throw new Exception('Unrecognized function in formula');
+						break;
+				}
+			$data = array('function' => $function, 'args' => $args);
 			break;
+			case 0x23:	//	index to defined name
+			case 0x43:
+			case 0x63:
+				$name = 'tName';
+				$size = 5;
+				// offset: 1; size: 2; one-based index to definedname record
+				$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
+				// offset: 2; size: 2; not used
+				$data = $this->_definedname[$definedNameIndex]['name'];
+				break;
+			case 0x24:	//	single cell reference e.g. A5
+			case 0x44:
+			case 0x64:
+				$name = 'tRef';
+				$size = 5;
+				$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
+				break;
+			case 0x25:	//	cell range reference to cells in the same sheet (2d)
+			case 0x45:
+			case 0x65:
+				$name = 'tArea';
+				$size = 9;
+				$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
+				break;
+			case 0x26:	//	Constant reference sub-expression
+			case 0x46:
+			case 0x66:
+				$name = 'tMemArea';
+				// offset: 1; size: 4; not used
+				// offset: 5; size: 2; size of the following subexpression
+				$subSize = self::_GetInt2d($formulaData, 5);
+				$size = 7 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
+				break;
+			case 0x27:	//	Deleted constant reference sub-expression
+			case 0x47:
+			case 0x67:
+				$name = 'tMemErr';
+				// offset: 1; size: 4; not used
+				// offset: 5; size: 2; size of the following subexpression
+				$subSize = self::_GetInt2d($formulaData, 5);
+				$size = 7 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
+				break;
+			case 0x29:	//	Variable reference sub-expression
+			case 0x49:
+			case 0x69:
+				$name = 'tMemFunc';
+				// offset: 1; size: 2; size of the following sub-expression
+				$subSize = self::_GetInt2d($formulaData, 1);
+				$size = 3 + $subSize;
+				$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
+				break;
 
-		case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
-		case 0x4C:
-		case 0x6C:
-			$name = 'tRefN';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
-			break;
+			case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
+			case 0x4C:
+			case 0x6C:
+				$name = 'tRefN';
+				$size = 5;
+				$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
+				break;
 
-		case 0x2D:	//	Relative 2d range reference
-		case 0x4D:
-		case 0x6D:
-			$name = 'tAreaN';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
-			break;
+			case 0x2D:	//	Relative 2d range reference
+			case 0x4D:
+			case 0x6D:
+				$name = 'tAreaN';
+				$size = 9;
+				$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
+				break;
 
-		case 0x39:	//	External name
-		case 0x59:
-		case 0x79:
-			$name = 'tNameX';
-			$size = 7;
-			// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
-			// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
-			$index = self::_GetInt2d($formulaData, 3);
-			// assume index is to EXTERNNAME record
-			$data = $this->_externalNames[$index - 1]['name'];
-			// offset: 5; size: 2; not used
-			break;
+			case 0x39:	//	External name
+			case 0x59:
+			case 0x79:
+				$name = 'tNameX';
+				$size = 7;
+				// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
+				// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
+				$index = self::_GetInt2d($formulaData, 3);
+				// assume index is to EXTERNNAME record
+				$data = $this->_externalNames[$index - 1]['name'];
+				// offset: 5; size: 2; not used
+				break;
 
-		case 0x3A:	//	3d reference to cell
-		case 0x5A:
-		case 0x7A:
-			$name = 'tRef3d';
-			$size = 7;
+			case 0x3A:	//	3d reference to cell
+			case 0x5A:
+			case 0x7A:
+				$name = 'tRef3d';
+				$size = 7;
 
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 4; cell address
-				$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
+				try {
+					// offset: 1; size: 2; index to REF entry
+					$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
+					// offset: 3; size: 4; cell address
+					$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
 
-				$data = "$sheetRange!$cellAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
+					$data = "$sheetRange!$cellAddress";
+				} catch (Exception $e) {
+					// deleted sheet reference
+					$data = '#REF!';
+				}
 
-			break;
-		case 0x3B:	//	3d reference to cell range
-		case 0x5B:
-		case 0x7B:
-			$name = 'tArea3d';
-			$size = 11;
+				break;
+			case 0x3B:	//	3d reference to cell range
+			case 0x5B:
+			case 0x7B:
+				$name = 'tArea3d';
+				$size = 11;
 
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 8; cell address
-				$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
+				try {
+					// offset: 1; size: 2; index to REF entry
+					$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
+					// offset: 3; size: 8; cell address
+					$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
 
-				$data = "$sheetRange!$cellRangeAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
+					$data = "$sheetRange!$cellRangeAddress";
+				} catch (Exception $e) {
+					// deleted sheet reference
+					$data = '#REF!';
+				}
 
-			break;
-		// Unknown cases	// don't know how to deal with
-		default:
-			throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
-			break;
+				break;
+			// Unknown cases	// don't know how to deal with
+			default:
+				throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+				break;
 		}
 
 		return array(
@@ -6259,35 +6259,35 @@ 
 		$identifier = ord($valueData[0]);
 
 		switch ($identifier) {
-		case 0x00: // empty constant (what is this?)
-			$value = '';
-			$size = 9;
-			break;
-		case 0x01: // number
-			// offset: 1; size: 8; IEEE 754 floating-point value
-			$value = self::_extractNumber(substr($valueData, 1, 8));
-			$size = 9;
-			break;
-		case 0x02: // string value
-			// offset: 1; size: var; Unicode string, 16-bit string length
-			$string = self::_readUnicodeStringLong(substr($valueData, 1));
-			$value = '"' . $string['value'] . '"';
-			$size = 1 + $string['size'];
-			break;
-		case 0x04: // boolean
-			// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
-			if (ord($valueData[1])) {
-				$value = 'TRUE';
-			} else {
-				$value = 'FALSE';
-			}
-			$size = 9;
-			break;
-		case 0x10: // error code
-			// offset: 1; size: 1; error code
-			$value = self::_mapErrorCode(ord($valueData[1]));
-			$size = 9;
-			break;
+			case 0x00: // empty constant (what is this?)
+				$value = '';
+				$size = 9;
+				break;
+			case 0x01: // number
+				// offset: 1; size: 8; IEEE 754 floating-point value
+				$value = self::_extractNumber(substr($valueData, 1, 8));
+				$size = 9;
+				break;
+			case 0x02: // string value
+				// offset: 1; size: var; Unicode string, 16-bit string length
+				$string = self::_readUnicodeStringLong(substr($valueData, 1));
+				$value = '"' . $string['value'] . '"';
+				$size = 1 + $string['size'];
+				break;
+			case 0x04: // boolean
+				// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
+				if (ord($valueData[1])) {
+					$value = 'TRUE';
+				} else {
+					$value = 'FALSE';
+				}
+				$size = 9;
+				break;
+			case 0x10: // error code
+				// offset: 1; size: 1; error code
+				$value = self::_mapErrorCode(ord($valueData[1]));
+				$size = 9;
+				break;
 		}
 		return array(
 			'value' => $value,

Spacing +634 added lines, -634 removed lines

@@ -58,12 +58,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -80,83 +80,83 @@ 
 	// ParseXL definitions
 	const XLS_BIFF8						= 0x0600;
 	const XLS_BIFF7						= 0x0500;
-	const XLS_WorkbookGlobals			= 0x0005;
-	const XLS_Worksheet					= 0x0010;
+	const XLS_WorkbookGlobals = 0x0005;
+	const XLS_Worksheet = 0x0010;
 
 	// record identifiers
 	const XLS_Type_FORMULA				= 0x0006;
-	const XLS_Type_EOF					= 0x000a;
+	const XLS_Type_EOF = 0x000a;
 	const XLS_Type_PROTECT				= 0x0012;
-	const XLS_Type_OBJECTPROTECT		= 0x0063;
-	const XLS_Type_SCENPROTECT			= 0x00dd;
-	const XLS_Type_PASSWORD				= 0x0013;
+	const XLS_Type_OBJECTPROTECT = 0x0063;
+	const XLS_Type_SCENPROTECT = 0x00dd;
+	const XLS_Type_PASSWORD = 0x0013;
 	const XLS_Type_HEADER				= 0x0014;
 	const XLS_Type_FOOTER				= 0x0015;
 	const XLS_Type_EXTERNSHEET			= 0x0017;
 	const XLS_Type_DEFINEDNAME			= 0x0018;
-	const XLS_Type_VERTICALPAGEBREAKS	= 0x001a;
-	const XLS_Type_HORIZONTALPAGEBREAKS	= 0x001b;
-	const XLS_Type_NOTE					= 0x001c;
+	const XLS_Type_VERTICALPAGEBREAKS = 0x001a;
+	const XLS_Type_HORIZONTALPAGEBREAKS = 0x001b;
+	const XLS_Type_NOTE = 0x001c;
 	const XLS_Type_SELECTION			= 0x001d;
 	const XLS_Type_DATEMODE				= 0x0022;
 	const XLS_Type_EXTERNNAME			= 0x0023;
 	const XLS_Type_LEFTMARGIN			= 0x0026;
-	const XLS_Type_RIGHTMARGIN			= 0x0027;
+	const XLS_Type_RIGHTMARGIN = 0x0027;
 	const XLS_Type_TOPMARGIN			= 0x0028;
-	const XLS_Type_BOTTOMMARGIN			= 0x0029;
-	const XLS_Type_PRINTGRIDLINES		= 0x002b;
+	const XLS_Type_BOTTOMMARGIN = 0x0029;
+	const XLS_Type_PRINTGRIDLINES = 0x002b;
 	const XLS_Type_FILEPASS				= 0x002f;
 	const XLS_Type_FONT					= 0x0031;
 	const XLS_Type_CONTINUE				= 0x003c;
 	const XLS_Type_PANE					= 0x0041;
 	const XLS_Type_CODEPAGE				= 0x0042;
-	const XLS_Type_DEFCOLWIDTH 			= 0x0055;
-	const XLS_Type_OBJ					= 0x005d;
+	const XLS_Type_DEFCOLWIDTH = 0x0055;
+	const XLS_Type_OBJ = 0x005d;
 	const XLS_Type_COLINFO				= 0x007d;
-	const XLS_Type_IMDATA				= 0x007f;
+	const XLS_Type_IMDATA = 0x007f;
 	const XLS_Type_SHEETPR				= 0x0081;
 	const XLS_Type_HCENTER				= 0x0083;
 	const XLS_Type_VCENTER				= 0x0084;
-	const XLS_Type_SHEET				= 0x0085;
+	const XLS_Type_SHEET = 0x0085;
 	const XLS_Type_PALETTE				= 0x0092;
-	const XLS_Type_SCL					= 0x00a0;
+	const XLS_Type_SCL = 0x00a0;
 	const XLS_Type_PAGESETUP			= 0x00a1;
-	const XLS_Type_MULRK				= 0x00bd;
+	const XLS_Type_MULRK = 0x00bd;
 	const XLS_Type_MULBLANK				= 0x00be;
-	const XLS_Type_DBCELL				= 0x00d7;
-	const XLS_Type_XF					= 0x00e0;
-	const XLS_Type_MERGEDCELLS			= 0x00e5;
-	const XLS_Type_MSODRAWINGGROUP		= 0x00eb;
-	const XLS_Type_MSODRAWING			= 0x00ec;
-	const XLS_Type_SST					= 0x00fc;
-	const XLS_Type_LABELSST				= 0x00fd;
-	const XLS_Type_EXTSST				= 0x00ff;
-	const XLS_Type_EXTERNALBOOK			= 0x01ae;
-	const XLS_Type_DATAVALIDATIONS		= 0x01b2;
-	const XLS_Type_TXO					= 0x01b6;
+	const XLS_Type_DBCELL = 0x00d7;
+	const XLS_Type_XF = 0x00e0;
+	const XLS_Type_MERGEDCELLS = 0x00e5;
+	const XLS_Type_MSODRAWINGGROUP = 0x00eb;
+	const XLS_Type_MSODRAWING = 0x00ec;
+	const XLS_Type_SST = 0x00fc;
+	const XLS_Type_LABELSST = 0x00fd;
+	const XLS_Type_EXTSST = 0x00ff;
+	const XLS_Type_EXTERNALBOOK = 0x01ae;
+	const XLS_Type_DATAVALIDATIONS = 0x01b2;
+	const XLS_Type_TXO = 0x01b6;
 	const XLS_Type_HYPERLINK			= 0x01b8;
-	const XLS_Type_DATAVALIDATION		= 0x01be;
+	const XLS_Type_DATAVALIDATION = 0x01be;
 	const XLS_Type_DIMENSION			= 0x0200;
 	const XLS_Type_BLANK				= 0x0201;
 	const XLS_Type_NUMBER				= 0x0203;
 	const XLS_Type_LABEL				= 0x0204;
-	const XLS_Type_BOOLERR				= 0x0205;
+	const XLS_Type_BOOLERR = 0x0205;
 	const XLS_Type_STRING				= 0x0207;
-	const XLS_Type_ROW					= 0x0208;
+	const XLS_Type_ROW = 0x0208;
 	const XLS_Type_INDEX				= 0x020b;
 	const XLS_Type_ARRAY				= 0x0221;
-	const XLS_Type_DEFAULTROWHEIGHT 	= 0x0225;
-	const XLS_Type_WINDOW2				= 0x023e;
-	const XLS_Type_RK					= 0x027e;
-	const XLS_Type_STYLE				= 0x0293;
-	const XLS_Type_FORMAT				= 0x041e;
-	const XLS_Type_SHAREDFMLA			= 0x04bc;
-	const XLS_Type_BOF					= 0x0809;
+	const XLS_Type_DEFAULTROWHEIGHT = 0x0225;
+	const XLS_Type_WINDOW2 = 0x023e;
+	const XLS_Type_RK = 0x027e;
+	const XLS_Type_STYLE = 0x0293;
+	const XLS_Type_FORMAT = 0x041e;
+	const XLS_Type_SHAREDFMLA = 0x04bc;
+	const XLS_Type_BOF = 0x0809;
 	const XLS_Type_SHEETPROTECTION		= 0x0867;
 	const XLS_Type_RANGEPROTECTION		= 0x0868;
-	const XLS_Type_SHEETLAYOUT			= 0x0862;
-	const XLS_Type_XFEXT				= 0x087d;
-	const XLS_Type_UNKNOWN				= 0xffff;
+	const XLS_Type_SHEETLAYOUT = 0x0862;
+	const XLS_Type_XFEXT = 0x087d;
+	const XLS_Type_UNKNOWN = 0xffff;
 
 
 	/**
@@ -515,8 +515,8 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		try {
@@ -542,8 +542,8 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetNames = array();
@@ -554,18 +554,18 @@ 
 		// total byte size of Excel data (workbook global substream + sheet substreams)
 		$this->_dataSize = strlen($this->_data);
 
-		$this->_pos		= 0;
-		$this->_sheets	= array();
+		$this->_pos = 0;
+		$this->_sheets = array();
 
 		// Parse Workbook Global Substream
 		while ($this->_pos < $this->_dataSize) {
 			$code = self::_GetInt2d($this->_data, $this->_pos);
 
 			switch ($code) {
-				case self::XLS_Type_BOF:	$this->_readBof();		break;
-				case self::XLS_Type_SHEET:	$this->_readSheet();	break;
-				case self::XLS_Type_EOF:	$this->_readDefault();	break 2;
-				default:					$this->_readDefault();	break;
+				case self::XLS_Type_BOF:	$this->_readBof(); break;
+				case self::XLS_Type_SHEET:	$this->_readSheet(); break;
+				case self::XLS_Type_EOF:	$this->_readDefault(); break 2;
+				default:					$this->_readDefault(); break;
 			}
 		}
 
@@ -591,8 +591,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$worksheetInfo = array();
@@ -612,10 +612,10 @@ 
 			$code = self::_GetInt2d($this->_data, $this->_pos);
 
 			switch ($code) {
-				case self::XLS_Type_BOF:        $this->_readBof();        break;
-				case self::XLS_Type_SHEET:      $this->_readSheet();      break;
-				case self::XLS_Type_EOF:        $this->_readDefault();    break 2;
-				default:                        $this->_readDefault();    break;
+				case self::XLS_Type_BOF:        $this->_readBof(); break;
+				case self::XLS_Type_SHEET:      $this->_readSheet(); break;
+				case self::XLS_Type_EOF:        $this->_readDefault(); break 2;
+				default:                        $this->_readDefault(); break;
 			}
 		}
 
@@ -660,9 +660,9 @@ 
 						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
 						$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
 						break;
-					case self::XLS_Type_BOF:      $this->_readBof();          break;
-					case self::XLS_Type_EOF:      $this->_readDefault();      break 2;
-					default:                      $this->_readDefault();      break;
+					case self::XLS_Type_BOF:      $this->_readBof(); break;
+					case self::XLS_Type_EOF:      $this->_readDefault(); break 2;
+					default:                      $this->_readDefault(); break;
 				}
 			}
 
@@ -691,7 +691,7 @@ 
 		// Initialisations
 		$this->_phpExcel = new PHPExcel;
 		$this->_phpExcel->removeSheetByIndex(0); // remove 1st sheet
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$this->_phpExcel->removeCellStyleXfByIndex(0); // remove the default style
 			$this->_phpExcel->removeCellXfByIndex(0); // remove the default style
 		}
@@ -706,54 +706,54 @@ 
 		$this->_dataSize = strlen($this->_data);
 
 		// initialize
-		$this->_pos					= 0;
+		$this->_pos = 0;
 		$this->_codepage			= 'CP1252';
 		$this->_formats				= array();
 		$this->_objFonts			= array();
 		$this->_palette				= array();
-		$this->_sheets				= array();
-		$this->_externalBooks		= array();
+		$this->_sheets = array();
+		$this->_externalBooks = array();
 		$this->_ref					= array();
-		$this->_definedname			= array();
+		$this->_definedname = array();
 		$this->_sst					= array();
-		$this->_drawingGroupData	= '';
-		$this->_xfIndex				= '';
-		$this->_mapCellXfIndex		= array();
-		$this->_mapCellStyleXfIndex	= array();
+		$this->_drawingGroupData = '';
+		$this->_xfIndex = '';
+		$this->_mapCellXfIndex = array();
+		$this->_mapCellStyleXfIndex = array();
 
 		// Parse Workbook Global Substream
 		while ($this->_pos < $this->_dataSize) {
 			$code = self::_GetInt2d($this->_data, $this->_pos);
 
 			switch ($code) {
-				case self::XLS_Type_BOF:			$this->_readBof();				break;
-				case self::XLS_Type_FILEPASS:		$this->_readFilepass();			break;
-				case self::XLS_Type_CODEPAGE:		$this->_readCodepage();			break;
-				case self::XLS_Type_DATEMODE:		$this->_readDateMode();			break;
-				case self::XLS_Type_FONT:			$this->_readFont();				break;
-				case self::XLS_Type_FORMAT:			$this->_readFormat();			break;
-				case self::XLS_Type_XF:				$this->_readXf();				break;
-				case self::XLS_Type_XFEXT:			$this->_readXfExt();			break;
-				case self::XLS_Type_STYLE:			$this->_readStyle();			break;
-				case self::XLS_Type_PALETTE:		$this->_readPalette();			break;
-				case self::XLS_Type_SHEET:			$this->_readSheet();			break;
-				case self::XLS_Type_EXTERNALBOOK:	$this->_readExternalBook();		break;
-				case self::XLS_Type_EXTERNNAME:		$this->_readExternName();		break;
-				case self::XLS_Type_EXTERNSHEET:	$this->_readExternSheet();		break;
-				case self::XLS_Type_DEFINEDNAME:	$this->_readDefinedName();		break;
-				case self::XLS_Type_MSODRAWINGGROUP:	$this->_readMsoDrawingGroup();	break;
-				case self::XLS_Type_SST:			$this->_readSst();				break;
-				case self::XLS_Type_EOF:			$this->_readDefault();			break 2;
-				default:							$this->_readDefault();			break;
+				case self::XLS_Type_BOF:			$this->_readBof(); break;
+				case self::XLS_Type_FILEPASS:		$this->_readFilepass(); break;
+				case self::XLS_Type_CODEPAGE:		$this->_readCodepage(); break;
+				case self::XLS_Type_DATEMODE:		$this->_readDateMode(); break;
+				case self::XLS_Type_FONT:			$this->_readFont(); break;
+				case self::XLS_Type_FORMAT:			$this->_readFormat(); break;
+				case self::XLS_Type_XF:				$this->_readXf(); break;
+				case self::XLS_Type_XFEXT:			$this->_readXfExt(); break;
+				case self::XLS_Type_STYLE:			$this->_readStyle(); break;
+				case self::XLS_Type_PALETTE:		$this->_readPalette(); break;
+				case self::XLS_Type_SHEET:			$this->_readSheet(); break;
+				case self::XLS_Type_EXTERNALBOOK:	$this->_readExternalBook(); break;
+				case self::XLS_Type_EXTERNNAME:		$this->_readExternName(); break;
+				case self::XLS_Type_EXTERNSHEET:	$this->_readExternSheet(); break;
+				case self::XLS_Type_DEFINEDNAME:	$this->_readDefinedName(); break;
+				case self::XLS_Type_MSODRAWINGGROUP:	$this->_readMsoDrawingGroup(); break;
+				case self::XLS_Type_SST:			$this->_readSst(); break;
+				case self::XLS_Type_EOF:			$this->_readDefault(); break 2;
+				default:							$this->_readDefault(); break;
 			}
 		}
 
 		// Resolve indexed colors for font, fill, and border colors
 		// Cannot be resolved already in XF record, because PALETTE record comes afterwards
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			foreach ($this->_objFonts as $objFont) {
 				if (isset($objFont->colorIndex)) {
-					$color = self::_readColor($objFont->colorIndex,$this->_palette,$this->_version);
+					$color = self::_readColor($objFont->colorIndex, $this->_palette, $this->_version);
 					$objFont->getColor()->setRGB($color['rgb']);
 				}
 			}
@@ -763,12 +763,12 @@ 
 				$fill = $objStyle->getFill();
 
 				if (isset($fill->startcolorIndex)) {
-					$startColor = self::_readColor($fill->startcolorIndex,$this->_palette,$this->_version);
+					$startColor = self::_readColor($fill->startcolorIndex, $this->_palette, $this->_version);
 					$fill->getStartColor()->setRGB($startColor['rgb']);
 				}
 
 				if (isset($fill->endcolorIndex)) {
-					$endColor = self::_readColor($fill->endcolorIndex,$this->_palette,$this->_version);
+					$endColor = self::_readColor($fill->endcolorIndex, $this->_palette, $this->_version);
 					$fill->getEndColor()->setRGB($endColor['rgb']);
 				}
 
@@ -780,34 +780,34 @@ 
 				$diagonal = $objStyle->getBorders()->getDiagonal();
 
 				if (isset($top->colorIndex)) {
-					$borderTopColor = self::_readColor($top->colorIndex,$this->_palette,$this->_version);
+					$borderTopColor = self::_readColor($top->colorIndex, $this->_palette, $this->_version);
 					$top->getColor()->setRGB($borderTopColor['rgb']);
 				}
 
 				if (isset($right->colorIndex)) {
-					$borderRightColor = self::_readColor($right->colorIndex,$this->_palette,$this->_version);
+					$borderRightColor = self::_readColor($right->colorIndex, $this->_palette, $this->_version);
 					$right->getColor()->setRGB($borderRightColor['rgb']);
 				}
 
 				if (isset($bottom->colorIndex)) {
-					$borderBottomColor = self::_readColor($bottom->colorIndex,$this->_palette,$this->_version);
+					$borderBottomColor = self::_readColor($bottom->colorIndex, $this->_palette, $this->_version);
 					$bottom->getColor()->setRGB($borderBottomColor['rgb']);
 				}
 
 				if (isset($left->colorIndex)) {
-					$borderLeftColor = self::_readColor($left->colorIndex,$this->_palette,$this->_version);
+					$borderLeftColor = self::_readColor($left->colorIndex, $this->_palette, $this->_version);
 					$left->getColor()->setRGB($borderLeftColor['rgb']);
 				}
 
 				if (isset($diagonal->colorIndex)) {
-					$borderDiagonalColor = self::_readColor($diagonal->colorIndex,$this->_palette,$this->_version);
+					$borderDiagonalColor = self::_readColor($diagonal->colorIndex, $this->_palette, $this->_version);
 					$diagonal->getColor()->setRGB($borderDiagonalColor['rgb']);
 				}
 			}
 		}
 
 		// treat MSODRAWINGGROUP records, workbook-level Escher
-		if (!$this->_readDataOnly && $this->_drawingGroupData) {
+		if ( ! $this->_readDataOnly && $this->_drawingGroupData) {
 			$escherWorkbook = new PHPExcel_Shared_Escher();
 			$reader = new PHPExcel_Reader_Excel5_Escher($escherWorkbook);
 			$escherWorkbook = $reader->load($this->_drawingGroupData);
@@ -826,7 +826,7 @@ 
 			}
 
 			// check if sheet should be skipped
-			if (isset($this->_loadSheetsOnly) && !in_array($sheet['name'], $this->_loadSheetsOnly)) {
+			if (isset($this->_loadSheetsOnly) && ! in_array($sheet['name'], $this->_loadSheetsOnly)) {
 				continue;
 			}
 
@@ -835,7 +835,7 @@ 
 			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
 			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
 			//		name in line with the formula, not the reverse
-			$this->_phpSheet->setTitle($sheet['name'],false);
+			$this->_phpSheet->setTitle($sheet['name'], false);
 			$this->_phpSheet->setSheetState($sheet['sheetState']);
 
 			$this->_pos = $sheet['offset'];
@@ -866,65 +866,65 @@ 
 				$code = self::_GetInt2d($this->_data, $this->_pos);
 
 				switch ($code) {
-					case self::XLS_Type_BOF:					$this->_readBof();						break;
-					case self::XLS_Type_PRINTGRIDLINES:			$this->_readPrintGridlines();			break;
-					case self::XLS_Type_DEFAULTROWHEIGHT:		$this->_readDefaultRowHeight();			break;
-					case self::XLS_Type_SHEETPR:				$this->_readSheetPr();					break;
-					case self::XLS_Type_HORIZONTALPAGEBREAKS:	$this->_readHorizontalPageBreaks();		break;
-					case self::XLS_Type_VERTICALPAGEBREAKS:		$this->_readVerticalPageBreaks();		break;
-					case self::XLS_Type_HEADER:					$this->_readHeader();					break;
-					case self::XLS_Type_FOOTER:					$this->_readFooter();					break;
-					case self::XLS_Type_HCENTER:				$this->_readHcenter();					break;
-					case self::XLS_Type_VCENTER:				$this->_readVcenter();					break;
-					case self::XLS_Type_LEFTMARGIN:				$this->_readLeftMargin();				break;
-					case self::XLS_Type_RIGHTMARGIN:			$this->_readRightMargin();				break;
-					case self::XLS_Type_TOPMARGIN:				$this->_readTopMargin();				break;
-					case self::XLS_Type_BOTTOMMARGIN:			$this->_readBottomMargin();				break;
-					case self::XLS_Type_PAGESETUP:				$this->_readPageSetup();				break;
-					case self::XLS_Type_PROTECT:				$this->_readProtect();					break;
-					case self::XLS_Type_SCENPROTECT:			$this->_readScenProtect();				break;
-					case self::XLS_Type_OBJECTPROTECT:			$this->_readObjectProtect();			break;
-					case self::XLS_Type_PASSWORD:				$this->_readPassword();					break;
-					case self::XLS_Type_DEFCOLWIDTH:			$this->_readDefColWidth();				break;
-					case self::XLS_Type_COLINFO:				$this->_readColInfo();					break;
-					case self::XLS_Type_DIMENSION:				$this->_readDefault();					break;
-					case self::XLS_Type_ROW:					$this->_readRow();						break;
-					case self::XLS_Type_DBCELL:					$this->_readDefault();					break;
-					case self::XLS_Type_RK:						$this->_readRk();						break;
-					case self::XLS_Type_LABELSST:				$this->_readLabelSst();					break;
-					case self::XLS_Type_MULRK:					$this->_readMulRk();					break;
-					case self::XLS_Type_NUMBER:					$this->_readNumber();					break;
-					case self::XLS_Type_FORMULA:				$this->_readFormula();					break;
-					case self::XLS_Type_SHAREDFMLA:				$this->_readSharedFmla();				break;
-					case self::XLS_Type_BOOLERR:				$this->_readBoolErr();					break;
-					case self::XLS_Type_MULBLANK:				$this->_readMulBlank();					break;
-					case self::XLS_Type_LABEL:					$this->_readLabel();					break;
-					case self::XLS_Type_BLANK:					$this->_readBlank();					break;
-					case self::XLS_Type_MSODRAWING:				$this->_readMsoDrawing();				break;
-					case self::XLS_Type_OBJ:					$this->_readObj();						break;
-					case self::XLS_Type_WINDOW2:				$this->_readWindow2();					break;
-					case self::XLS_Type_SCL:					$this->_readScl();						break;
-					case self::XLS_Type_PANE:					$this->_readPane();						break;
-					case self::XLS_Type_SELECTION:				$this->_readSelection();				break;
-					case self::XLS_Type_MERGEDCELLS:			$this->_readMergedCells();				break;
-					case self::XLS_Type_HYPERLINK:				$this->_readHyperLink();				break;
-					case self::XLS_Type_DATAVALIDATIONS:		$this->_readDataValidations();			break;
-					case self::XLS_Type_DATAVALIDATION:			$this->_readDataValidation();			break;
-					case self::XLS_Type_SHEETLAYOUT:			$this->_readSheetLayout();				break;
-					case self::XLS_Type_SHEETPROTECTION:		$this->_readSheetProtection();			break;
-					case self::XLS_Type_RANGEPROTECTION:		$this->_readRangeProtection();			break;
-					case self::XLS_Type_NOTE:					$this->_readNote();						break;
+					case self::XLS_Type_BOF:					$this->_readBof(); break;
+					case self::XLS_Type_PRINTGRIDLINES:			$this->_readPrintGridlines(); break;
+					case self::XLS_Type_DEFAULTROWHEIGHT:		$this->_readDefaultRowHeight(); break;
+					case self::XLS_Type_SHEETPR:				$this->_readSheetPr(); break;
+					case self::XLS_Type_HORIZONTALPAGEBREAKS:	$this->_readHorizontalPageBreaks(); break;
+					case self::XLS_Type_VERTICALPAGEBREAKS:		$this->_readVerticalPageBreaks(); break;
+					case self::XLS_Type_HEADER:					$this->_readHeader(); break;
+					case self::XLS_Type_FOOTER:					$this->_readFooter(); break;
+					case self::XLS_Type_HCENTER:				$this->_readHcenter(); break;
+					case self::XLS_Type_VCENTER:				$this->_readVcenter(); break;
+					case self::XLS_Type_LEFTMARGIN:				$this->_readLeftMargin(); break;
+					case self::XLS_Type_RIGHTMARGIN:			$this->_readRightMargin(); break;
+					case self::XLS_Type_TOPMARGIN:				$this->_readTopMargin(); break;
+					case self::XLS_Type_BOTTOMMARGIN:			$this->_readBottomMargin(); break;
+					case self::XLS_Type_PAGESETUP:				$this->_readPageSetup(); break;
+					case self::XLS_Type_PROTECT:				$this->_readProtect(); break;
+					case self::XLS_Type_SCENPROTECT:			$this->_readScenProtect(); break;
+					case self::XLS_Type_OBJECTPROTECT:			$this->_readObjectProtect(); break;
+					case self::XLS_Type_PASSWORD:				$this->_readPassword(); break;
+					case self::XLS_Type_DEFCOLWIDTH:			$this->_readDefColWidth(); break;
+					case self::XLS_Type_COLINFO:				$this->_readColInfo(); break;
+					case self::XLS_Type_DIMENSION:				$this->_readDefault(); break;
+					case self::XLS_Type_ROW:					$this->_readRow(); break;
+					case self::XLS_Type_DBCELL:					$this->_readDefault(); break;
+					case self::XLS_Type_RK:						$this->_readRk(); break;
+					case self::XLS_Type_LABELSST:				$this->_readLabelSst(); break;
+					case self::XLS_Type_MULRK:					$this->_readMulRk(); break;
+					case self::XLS_Type_NUMBER:					$this->_readNumber(); break;
+					case self::XLS_Type_FORMULA:				$this->_readFormula(); break;
+					case self::XLS_Type_SHAREDFMLA:				$this->_readSharedFmla(); break;
+					case self::XLS_Type_BOOLERR:				$this->_readBoolErr(); break;
+					case self::XLS_Type_MULBLANK:				$this->_readMulBlank(); break;
+					case self::XLS_Type_LABEL:					$this->_readLabel(); break;
+					case self::XLS_Type_BLANK:					$this->_readBlank(); break;
+					case self::XLS_Type_MSODRAWING:				$this->_readMsoDrawing(); break;
+					case self::XLS_Type_OBJ:					$this->_readObj(); break;
+					case self::XLS_Type_WINDOW2:				$this->_readWindow2(); break;
+					case self::XLS_Type_SCL:					$this->_readScl(); break;
+					case self::XLS_Type_PANE:					$this->_readPane(); break;
+					case self::XLS_Type_SELECTION:				$this->_readSelection(); break;
+					case self::XLS_Type_MERGEDCELLS:			$this->_readMergedCells(); break;
+					case self::XLS_Type_HYPERLINK:				$this->_readHyperLink(); break;
+					case self::XLS_Type_DATAVALIDATIONS:		$this->_readDataValidations(); break;
+					case self::XLS_Type_DATAVALIDATION:			$this->_readDataValidation(); break;
+					case self::XLS_Type_SHEETLAYOUT:			$this->_readSheetLayout(); break;
+					case self::XLS_Type_SHEETPROTECTION:		$this->_readSheetProtection(); break;
+					case self::XLS_Type_RANGEPROTECTION:		$this->_readRangeProtection(); break;
+					case self::XLS_Type_NOTE:					$this->_readNote(); break;
 					//case self::XLS_Type_IMDATA:				$this->_readImData();					break;
-					case self::XLS_Type_TXO:					$this->_readTextObject();				break;
-					case self::XLS_Type_CONTINUE:				$this->_readContinue();					break;
-					case self::XLS_Type_EOF:					$this->_readDefault();					break 2;
-					default:									$this->_readDefault();					break;
+					case self::XLS_Type_TXO:					$this->_readTextObject(); break;
+					case self::XLS_Type_CONTINUE:				$this->_readContinue(); break;
+					case self::XLS_Type_EOF:					$this->_readDefault(); break 2;
+					default:									$this->_readDefault(); break;
 				}
 
 			}
 
 			// treat MSODRAWING records, sheet-level Escher
-			if (!$this->_readDataOnly && $this->_drawingData) {
+			if ( ! $this->_readDataOnly && $this->_drawingData) {
 				$escherWorksheet = new PHPExcel_Shared_Escher();
 				$reader = new PHPExcel_Reader_Excel5_Escher($escherWorksheet);
 				$escherWorksheet = $reader->load($this->_drawingData);
@@ -1046,22 +1046,22 @@ 
 			if ($this->_version == self::XLS_BIFF8) {
 				foreach ($this->_sharedFormulaParts as $cell => $baseCell) {
 					list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
-					if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
+					if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle())) {
 						$formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell);
-						$this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
+						$this->_phpSheet->getCell($cell)->setValueExplicit('='.$formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
 					}
 				}
 			}
 
-			if (!empty($this->_cellNotes)) {
-				foreach($this->_cellNotes as $note => $noteDetails) {
+			if ( ! empty($this->_cellNotes)) {
+				foreach ($this->_cellNotes as $note => $noteDetails) {
 //					echo '<b>Cell annotation ',$note,'</b><br />';
 //					var_dump($noteDetails);
 //					echo '<br />';
-					$cellAddress = str_replace('$','',$noteDetails['cellRef']);
-					$this->_phpSheet->getComment( $cellAddress )
-													->setAuthor( $noteDetails['author'] )
-													->setText($this->_parseRichText($noteDetails['objTextData']['text']) );
+					$cellAddress = str_replace('$', '', $noteDetails['cellRef']);
+					$this->_phpSheet->getComment($cellAddress)
+													->setAuthor($noteDetails['author'])
+													->setText($this->_parseRichText($noteDetails['objTextData']['text']));
 				}
 			}
 		}
@@ -1083,7 +1083,7 @@ 
 						//		Foo!$C$7:$J$66
 						//		Bar!$A$1:$IV$2
 
-						$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
+						$explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark?
 						$sheetName = $explodes[0];
 
 						if (count($explodes) == 2) {
@@ -1147,7 +1147,7 @@ 
 
 				if (count($explodes) == 2) {
 					if (($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) ||
-						($docSheet = $this->_phpExcel->getSheetByName(trim($explodes[0],"'")))) {
+						($docSheet = $this->_phpExcel->getSheetByName(trim($explodes[0], "'")))) {
 						$extractedRange = $explodes[1];
 						$extractedRange = str_replace('$', '', $extractedRange);
 
@@ -1156,7 +1156,7 @@ 
 						$scope = ($definedName['scope'] == 0) ?
 							null : $this->_phpExcel->getSheetByName($this->_sheets[$definedName['scope'] - 1]['name']);
 
-						$this->_phpExcel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $docSheet, $extractedRange, $localOnly, $scope) );
+						$this->_phpExcel->addNamedRange(new PHPExcel_NamedRange((string) $definedName['name'], $docSheet, $extractedRange, $localOnly, $scope));
 					}
 				} else {
 					//	Named Value
@@ -1200,7 +1200,7 @@ 
 	 */
 	private function _readSummaryInformation()
 	{
-		if (!isset($this->_summaryInformation)) {
+		if ( ! isset($this->_summaryInformation)) {
 			return;
 		}
 
@@ -1221,7 +1221,7 @@ 
 		$secLength = self::_GetInt4d($this->_summaryInformation, $secOffset);
 
 		// offset: $secOffset+4; size: 4; property count
-		$countProperties = self::_GetInt4d($this->_summaryInformation, $secOffset+4);
+		$countProperties = self::_GetInt4d($this->_summaryInformation, $secOffset + 4);
 
 		// initialize code page (used to resolve string values)
 		$codePage = 'CP1252';
@@ -1231,11 +1231,11 @@ 
 		for ($i = 0; $i < $countProperties; ++$i) {
 
 			// offset: ($secOffset+8) + (8 * $i); size: 4; property ID
-			$id = self::_GetInt4d($this->_summaryInformation, ($secOffset+8) + (8 * $i));
+			$id = self::_GetInt4d($this->_summaryInformation, ($secOffset + 8) + (8 * $i));
 
 			// Use value of property id as appropriate
 			// offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_summaryInformation, ($secOffset+12) + (8 * $i));
+			$offset = self::_GetInt4d($this->_summaryInformation, ($secOffset + 12) + (8 * $i));
 
 			$type = self::_GetInt4d($this->_summaryInformation, $secOffset + $offset);
 
@@ -1360,7 +1360,7 @@ 
 	 */
 	private function _readDocumentSummaryInformation()
 	{
-		if (!isset($this->_documentSummaryInformation)) {
+		if ( ! isset($this->_documentSummaryInformation)) {
 			return;
 		}
 
@@ -1384,7 +1384,7 @@ 
 //		echo '$secLength = ',$secLength,'<br />';
 
 		//	offset: $secOffset+4;	size: 4;	property count
-		$countProperties = self::_GetInt4d($this->_documentSummaryInformation, $secOffset+4);
+		$countProperties = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4);
 //		echo '$countProperties = ',$countProperties,'<br />';
 
 		// initialize code page (used to resolve string values)
@@ -1395,12 +1395,12 @@ 
 		for ($i = 0; $i < $countProperties; ++$i) {
 //			echo 'Property ',$i,'<br />';
 			//	offset: ($secOffset+8) + (8 * $i);	size: 4;	property ID
-			$id = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+8) + (8 * $i));
+			$id = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset + 8) + (8 * $i));
 //			echo 'ID is ',$id,'<br />';
 
 			// Use value of property id as appropriate
 			// offset: 60 + 8 * $i;	size: 4;	offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+12) + (8 * $i));
+			$offset = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset + 12) + (8 * $i));
 
 			$type = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + $offset);
 //			echo 'Type is ',$type,', ';
@@ -1569,7 +1569,7 @@ 
 			}
 //			echo 'Note Address=',$cellAddress,'<br />';
 
-			$cellAddress = str_replace('$','',$cellAddress);
+			$cellAddress = str_replace('$', '', $cellAddress);
 			$noteLength = self::_GetInt2d($recordData, 4);
 			$noteText = trim(substr($recordData, 6));
 //			echo 'Note Length=',$noteLength,'<br />';
@@ -1577,14 +1577,14 @@ 
 
 			if ($extension) {
 				//	Concatenate this extension with the currently set comment for the cell
-				$comment = $this->_phpSheet->getComment( $cellAddress );
+				$comment = $this->_phpSheet->getComment($cellAddress);
 				$commentText = $comment->getText()->getPlainText();
-				$comment->setText($this->_parseRichText($commentText.$noteText) );
+				$comment->setText($this->_parseRichText($commentText.$noteText));
 			} else {
 				//	Set comment for the cell
-				$this->_phpSheet->getComment( $cellAddress )
+				$this->_phpSheet->getComment($cellAddress)
 //													->setAuthor( $author )
-													->setText($this->_parseRichText($noteText) );
+													->setText($this->_parseRichText($noteText));
 			}
 		}
 
@@ -1612,15 +1612,15 @@ 
 		//	cchText: 2 bytes; length of the text (in the first continue record)
 		//	cbRuns: 2 bytes; length of the formatting (in the second continue record)
 		// followed by the continuation records containing the actual text and formatting
-		$grbitOpts	= self::_GetInt2d($recordData, 0);
-		$rot		= self::_GetInt2d($recordData, 2);
+		$grbitOpts = self::_GetInt2d($recordData, 0);
+		$rot = self::_GetInt2d($recordData, 2);
 		$cchText	= self::_GetInt2d($recordData, 10);
 		$cbRuns		= self::_GetInt2d($recordData, 12);
-		$text		= $this->_getSplicedRecordData();
+		$text = $this->_getSplicedRecordData();
 
 		$this->_textObjects[$this->textObjRef] = array(
-				'text'		=> substr($text["recordData"],$text["spliceOffsets"][0]+1,$cchText),
-				'format'	=> substr($text["recordData"],$text["spliceOffsets"][1],$cbRuns),
+				'text'		=> substr($text["recordData"], $text["spliceOffsets"][0] + 1, $cchText),
+				'format'	=> substr($text["recordData"], $text["spliceOffsets"][1], $cbRuns),
 				'alignment'	=> $grbitOpts,
 				'rotation'	=> $rot
 			 );
@@ -1757,7 +1757,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$objFont = new PHPExcel_Style_Font();
 
 			// offset: 0; size: 2; height of the font (in twips = 1/20 of a point)
@@ -1855,7 +1855,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$indexCode = self::_GetInt2d($recordData, 0);
 
 			if ($this->_version == self::XLS_BIFF8) {
@@ -1895,7 +1895,7 @@ 
 
 		$objStyle = new PHPExcel_Style();
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset:  0; size: 2; Index to FONT record
 			if (self::_GetInt2d($recordData, 0) < 4) {
 				$fontIndex = self::_GetInt2d($recordData, 0);
@@ -2176,7 +2176,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; 0x087D = repeated header
 
 			// offset: 2; size: 2
@@ -2214,7 +2214,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
 								$fill->getStartColor()->setRGB($rgb);
 								unset($fill->startcolorIndex); // normal color index does not apply, discard
@@ -2230,7 +2230,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
 								$fill->getEndColor()->setRGB($rgb);
 								unset($fill->endcolorIndex); // normal color index does not apply, discard
@@ -2246,7 +2246,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$top = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getTop();
 								$top->getColor()->setRGB($rgb);
 								unset($top->colorIndex); // normal color index does not apply, discard
@@ -2262,7 +2262,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$bottom = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getBottom();
 								$bottom->getColor()->setRGB($rgb);
 								unset($bottom->colorIndex); // normal color index does not apply, discard
@@ -2278,7 +2278,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$left = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getLeft();
 								$left->getColor()->setRGB($rgb);
 								unset($left->colorIndex); // normal color index does not apply, discard
@@ -2294,7 +2294,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$right = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getRight();
 								$right->getColor()->setRGB($rgb);
 								unset($right->colorIndex); // normal color index does not apply, discard
@@ -2310,7 +2310,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$diagonal = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
 								$diagonal->getColor()->setRGB($rgb);
 								unset($diagonal->colorIndex); // normal color index does not apply, discard
@@ -2326,7 +2326,7 @@ 
 							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
 
 							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
+							if (isset($this->_mapCellXfIndex[$ixfe])) {
 								$font = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFont();
 								$font->getColor()->setRGB($rgb);
 								unset($font->colorIndex); // normal color index does not apply, discard
@@ -2353,7 +2353,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; index to XF record and flag for built-in style
 			$ixfe = self::_GetInt2d($recordData, 0);
 
@@ -2394,7 +2394,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; number of following colors
 			$nm = self::_GetInt2d($recordData, 0);
 
@@ -2432,10 +2432,10 @@ 
 
 		// offset: 4; size: 1; sheet state
 		switch (ord($recordData{4})) {
-			case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;    break;
-			case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN;     break;
+			case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE; break;
+			case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN; break;
 			case 0x02: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN; break;
-			default: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;      break;
+			default: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE; break;
 		}
 
 		// offset: 5; size: 1; sheet type
@@ -2632,7 +2632,7 @@ 
 
 			// offset: var; size: $flen; formula data
 			$offset = 14 + $string['size'];
-			$formulaStructure = pack('v', $flen) . substr($recordData, $offset);
+			$formulaStructure = pack('v', $flen).substr($recordData, $offset);
 
 			try {
 				$formula = $this->_getFormulaFromStructure($formulaStructure);
@@ -2706,7 +2706,7 @@ 
 			++$pos;
 
 			// bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
-			$isCompressed = (($optionFlags & 0x01) == 0) ;
+			$isCompressed = (($optionFlags & 0x01) == 0);
 
 			// bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
 			$hasAsian = (($optionFlags & 0x04) != 0);
@@ -2782,7 +2782,7 @@ 
 						$charsLeft -= $len;
 						$isCompressed = true;
 
-					} elseif (!$isCompressed && ($option != 0)) {
+					} elseif ( ! $isCompressed && ($option != 0)) {
 						// 1st fragment uncompressed
 						// this fragment uncompressed
 						$len = min($charsLeft * 2, $limitpos - $pos);
@@ -2790,12 +2790,12 @@ 
 						$charsLeft -= $len / 2;
 						$isCompressed = false;
 
-					} elseif (!$isCompressed && ($option == 0)) {
+					} elseif ( ! $isCompressed && ($option == 0)) {
 						// 1st fragment uncompressed
 						// this fragment compressed
 						$len = min($charsLeft, $limitpos - $pos);
 						for ($j = 0; $j < $len; ++$j) {
-							$retstr .= $recordData{$pos + $j} . chr(0);
+							$retstr .= $recordData{$pos + $j}.chr(0);
 						}
 						$charsLeft -= $len;
 						$isCompressed = false;
@@ -2805,7 +2805,7 @@ 
 						// this fragment uncompressed
 						$newstr = '';
 						for ($j = 0; $j < strlen($retstr); ++$j) {
-							$newstr .= $retstr[$j] . chr(0);
+							$newstr .= $retstr[$j].chr(0);
 						}
 						$retstr = $newstr;
 						$len = min($charsLeft * 2, $limitpos - $pos);
@@ -2868,7 +2868,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
+		if ($this->_version == self::XLS_BIFF8 && ! $this->_readDataOnly) {
 			// offset: 0; size: 2; 0 = do not print sheet grid lines; 1 = print sheet gridlines
 			$printGridlines = (bool) self::_GetInt2d($recordData, 0);
 			$this->_phpSheet->setPrintGridlines($printGridlines);
@@ -2932,7 +2932,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
+		if ($this->_version == self::XLS_BIFF8 && ! $this->_readDataOnly) {
 
 			// offset: 0; size: 2; number of the following row index structures
 			$nm = self::_GetInt2d($recordData, 0);
@@ -2961,7 +2961,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
+		if ($this->_version == self::XLS_BIFF8 && ! $this->_readDataOnly) {
 			// offset: 0; size: 2; number of the following column index structures
 			$nm = self::_GetInt2d($recordData, 0);
 
@@ -2989,7 +2989,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: var
 			// realized that $recordData can be empty even when record exists
 			if ($recordData) {
@@ -3017,7 +3017,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: var
 			// realized that $recordData can be empty even when record exists
 			if ($recordData) {
@@ -3044,7 +3044,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; 0 = print sheet left aligned, 1 = print sheet centered horizontally
 			$isHorizontalCentered = (bool) self::_GetInt2d($recordData, 0);
 
@@ -3064,7 +3064,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; 0 = print sheet aligned at top page border, 1 = print sheet vertically centered
 			$isVerticalCentered = (bool) self::_GetInt2d($recordData, 0);
 
@@ -3084,7 +3084,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 8
 			$this->_phpSheet->getPageMargins()->setLeft(self::_extractNumber($recordData));
 		}
@@ -3102,7 +3102,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 8
 			$this->_phpSheet->getPageMargins()->setRight(self::_extractNumber($recordData));
 		}
@@ -3120,7 +3120,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 8
 			$this->_phpSheet->getPageMargins()->setTop(self::_extractNumber($recordData));
 		}
@@ -3138,7 +3138,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 8
 			$this->_phpSheet->getPageMargins()->setBottom(self::_extractNumber($recordData));
 		}
@@ -3156,7 +3156,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; paper size
 			$paperSize = self::_GetInt2d($recordData, 0);
 
@@ -3178,7 +3178,7 @@ 
 				// when this bit is set, do not use flags for those properties
 				$isNotInit = (0x0004 & self::_GetInt2d($recordData, 10)) >> 2;
 
-			if (!$isNotInit) {
+			if ( ! $isNotInit) {
 				$this->_phpSheet->getPageSetup()->setPaperSize($paperSize);
 				switch ($isPortrait) {
 				case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
@@ -3222,7 +3222,7 @@ 
 
 		// bit 0, mask 0x01; 1 = sheet is protected
 		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-		$this->_phpSheet->getProtection()->setSheet((bool)$bool);
+		$this->_phpSheet->getProtection()->setSheet((bool) $bool);
 	}
 
 
@@ -3246,7 +3246,7 @@ 
 		// bit: 0, mask 0x01; 1 = scenarios are protected
 		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
 
-		$this->_phpSheet->getProtection()->setScenarios((bool)$bool);
+		$this->_phpSheet->getProtection()->setScenarios((bool) $bool);
 	}
 
 
@@ -3270,7 +3270,7 @@ 
 		// bit: 0, mask 0x01; 1 = objects are protected
 		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
 
-		$this->_phpSheet->getProtection()->setObjects((bool)$bool);
+		$this->_phpSheet->getProtection()->setObjects((bool) $bool);
 	}
 
 
@@ -3285,7 +3285,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; 16-bit hash value of password
 			$password = strtoupper(dechex(self::_GetInt2d($recordData, 0))); // the hashed password
 			$this->_phpSheet->getProtection()->setPassword($password, true);
@@ -3323,7 +3323,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; index to first column in range
 			$fc = self::_GetInt2d($recordData, 0); // first column index
 
@@ -3355,7 +3355,7 @@ 
 					break;
 				}
 				$this->_phpSheet->getColumnDimensionByColumn($i)->setWidth($width / 256);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
+				$this->_phpSheet->getColumnDimensionByColumn($i)->setVisible( ! $isHidden);
 				$this->_phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
 				$this->_phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
 				$this->_phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
@@ -3382,7 +3382,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; index of this row
 			$r = self::_GetInt2d($recordData, 0);
 
@@ -3398,7 +3398,7 @@ 
 			// bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
 			$useDefaultHeight = (0x8000 & self::_GetInt2d($recordData, 6)) >> 15;
 
-			if (!$useDefaultHeight) {
+			if ( ! $useDefaultHeight) {
 				$this->_phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
 			}
 
@@ -3418,7 +3418,7 @@ 
 
 			// bit: 5; mask: 0x00000020; 1 = row is hidden
 			$isHidden = (0x00000020 & self::_GetInt4d($recordData, 12)) >> 5;
-			$this->_phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
+			$this->_phpSheet->getRowDimension($r + 1)->setVisible( ! $isHidden);
 
 			// bit: 7; mask: 0x00000080; 1 = row has explicit format
 			$hasExplicitFormat = (0x00000080 & self::_GetInt4d($recordData, 12)) >> 7;
@@ -3460,7 +3460,7 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3468,8 +3468,8 @@ 
 			$rknum = self::_GetInt4d($recordData, 6);
 			$numValue = self::_GetIEEE754($rknum);
 
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
+			$cell = $this->_phpSheet->getCell($columnString.($row + 1));
+			if ( ! $this->_readDataOnly) {
 				// add style information
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
@@ -3505,7 +3505,7 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3513,7 +3513,7 @@ 
 			$index = self::_GetInt4d($recordData, 6);
 
 			// add cell
-			if (($fmtRuns = $this->_sst[$index]['fmtRuns']) && !$this->_readDataOnly) {
+			if (($fmtRuns = $this->_sst[$index]['fmtRuns']) && ! $this->_readDataOnly) {
 				// then we should treat as rich text
 				$richText = new PHPExcel_RichText();
 				$charPos = 0;
@@ -3544,14 +3544,14 @@ 
 						}
 					}
 				}
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
+				$cell = $this->_phpSheet->getCell($columnString.($row + 1));
 				$cell->setValueExplicit($richText, PHPExcel_Cell_DataType::TYPE_STRING);
 			} else {
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
+				$cell = $this->_phpSheet->getCell($columnString.($row + 1));
 				$cell->setValueExplicit($this->_sst[$index]['value'], PHPExcel_Cell_DataType::TYPE_STRING);
 			}
 
-			if (!$this->_readDataOnly) {
+			if ( ! $this->_readDataOnly) {
 				// add style information
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
@@ -3592,15 +3592,15 @@ 
 			$columnString = PHPExcel_Cell::stringFromColumnIndex($colFirst + $i);
 
 			// Read cell?
-			if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+			if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 
 				// offset: var; size: 2; index to XF record
 				$xfIndex = self::_GetInt2d($recordData, $offset);
 
 				// offset: var; size: 4; RK value
 				$numValue = self::_GetIEEE754(self::_GetInt4d($recordData, $offset + 2));
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				if (!$this->_readDataOnly) {
+				$cell = $this->_phpSheet->getCell($columnString.($row + 1));
+				if ( ! $this->_readDataOnly) {
 					// add style
 					$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 				}
@@ -3638,14 +3638,14 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
 			$numValue = self::_extractNumber(substr($recordData, 6, 8));
 
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
+			$cell = $this->_phpSheet->getCell($columnString.($row + 1));
+			if ( ! $this->_readDataOnly) {
 				// add cell style
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
@@ -3701,15 +3701,15 @@ 
 			// get the base cell, grab tExp token
 			$baseRow = self::_GetInt2d($formulaStructure, 3);
 			$baseCol = self::_GetInt2d($formulaStructure, 5);
-			$this->_baseCell = PHPExcel_Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
+			$this->_baseCell = PHPExcel_Cell::stringFromColumnIndex($baseCol).($baseRow + 1);
 		}
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 
 			if ($isPartOfSharedFormula) {
 				// formula is added to this cell after the sheet has been read
-				$this->_sharedFormulaParts[$columnString . ($row + 1)] = $this->_baseCell;
+				$this->_sharedFormulaParts[$columnString.($row + 1)] = $this->_baseCell;
 			}
 
 			// offset: 16: size: 4; not used
@@ -3718,9 +3718,9 @@ 
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
 			// offset: 6; size: 8; result of the formula
-			if ( (ord($recordData{6}) == 0)
+			if ((ord($recordData{6}) == 0)
 				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255) ) {
+				&& (ord($recordData{13}) == 255)) {
 
 				// String formula. Result follows in appended STRING record
 				$dataType = PHPExcel_Cell_DataType::TYPE_STRING;
@@ -3766,14 +3766,14 @@ 
 
 			}
 
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
+			$cell = $this->_phpSheet->getCell($columnString.($row + 1));
+			if ( ! $this->_readDataOnly) {
 				// add cell style
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
 
 			// store the formula
-			if (!$isPartOfSharedFormula) {
+			if ( ! $isPartOfSharedFormula) {
 				// not part of shared formula
 				// add cell value. If we can read formula, populate with formula, otherwise just used cached value
 				try {
@@ -3781,7 +3781,7 @@ 
 						throw new Exception('Not BIFF8. Can only read BIFF8 formulas');
 					}
 					$formula = $this->_getFormulaFromStructure($formulaStructure); // get formula in human language
-					$cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
+					$cell->setValueExplicit('='.$formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
 
 				} catch (Exception $e) {
 					$cell->setValueExplicit($value, $dataType);
@@ -3882,7 +3882,7 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3892,7 +3892,7 @@ 
 			// offset: 7; size: 1; 0=boolean; 1=error
 			$isError = ord($recordData{7});
 
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
+			$cell = $this->_phpSheet->getCell($columnString.($row + 1));
 			switch ($isError) {
 				case 0: // boolean
 					$value = (bool) $boolErr;
@@ -3909,7 +3909,7 @@ 
 					break;
 			}
 
-			if (!$this->_readDataOnly) {
+			if ( ! $this->_readDataOnly) {
 				// add cell style
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
@@ -3941,14 +3941,14 @@ 
 
 		// offset: 4; size: 2 x nc; list of indexes to XF records
 		// add style information
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			for ($i = 0; $i < $length / 2 - 3; ++$i) {
 				$columnString = PHPExcel_Cell::stringFromColumnIndex($fc + $i);
 
 				// Read cell?
-				if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+				if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 					$xfIndex = self::_GetInt2d($recordData, 4 + 2 * $i);
-					$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
+					$this->_phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 				}
 			}
 		}
@@ -3983,7 +3983,7 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset: 4; size: 2; XF index
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3996,10 +3996,10 @@ 
 				$string = $this->_readByteStringLong(substr($recordData, 6));
 				$value = $string['value'];
 			}
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
+			$cell = $this->_phpSheet->getCell($columnString.($row + 1));
 			$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
 
-			if (!$this->_readDataOnly) {
+			if ( ! $this->_readDataOnly) {
 				// add cell style
 				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
@@ -4026,13 +4026,13 @@ 
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($col);
 
 		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle())) {
 			// offset: 4; size: 2; XF index
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
 			// add style information
-			if (!$this->_readDataOnly) {
-				$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
+			if ( ! $this->_readDataOnly) {
+				$this->_phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 			}
 		}
 
@@ -4081,7 +4081,7 @@ 
 		$ftCmoType	= self::_GetInt2d($recordData, 0);
 		$cbCmoSize	= self::_GetInt2d($recordData, 2);
 		$otObjType	= self::_GetInt2d($recordData, 4);
-		$idObjID	= self::_GetInt2d($recordData, 6);
+		$idObjID = self::_GetInt2d($recordData, 6);
 		$grbitOpts	= self::_GetInt2d($recordData, 6);
 
 		$this->_objs[] = array(
@@ -4125,7 +4125,7 @@ 
 		$this->_frozen = (bool) ((0x0008 & $options) >> 3);
 
 		// bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
-		$this->_phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
+		$this->_phpSheet->setRightToLeft((bool) ((0x0040 & $options) >> 6));
 
 		// bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
 		$isActive = (bool) ((0x0400 & $options) >> 10);
@@ -4168,7 +4168,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; position of vertical split
 			$px = self::_GetInt2d($recordData, 0);
 
@@ -4177,7 +4177,7 @@ 
 
 			if ($this->_frozen) {
 				// frozen panes
-				$this->_phpSheet->freezePane(PHPExcel_Cell::stringFromColumnIndex($px) . ($py + 1));
+				$this->_phpSheet->freezePane(PHPExcel_Cell::stringFromColumnIndex($px).($py + 1));
 			} else {
 				// unfrozen panes; split windows; not supported by PHPExcel core
 			}
@@ -4196,7 +4196,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 1; pane identifier
 			$paneId = ord($recordData{0});
 
@@ -4273,7 +4273,7 @@ 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
+		if ($this->_version == self::XLS_BIFF8 && ! $this->_readDataOnly) {
 			$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($recordData);
 			foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
 				if ($this->_includeCellRangeFiltered($cellRangeAddress)) {
@@ -4295,7 +4295,7 @@ 
 		// move stream pointer forward to next record
 		$this->_pos += 4 + $length;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 8; cell range address of all cells containing this hyperlink
 			try {
 				$cellRange = $this->_readBIFF8CellRangeAddressFixed($recordData, 0, 8);
@@ -4347,7 +4347,7 @@ 
 
 			if ($isUNC) {
 				$hyperlinkType = 'UNC';
-			} else if (!$isFileLinkOrUrl) {
+			} else if ( ! $isFileLinkOrUrl) {
 				$hyperlinkType = 'workbook';
 			} else if (ord($recordData{$offset}) == 0x03) {
 				$hyperlinkType = 'local';
@@ -4494,22 +4494,22 @@ 
 		// bit: 0-3; mask: 0x0000000F; type
 		$type = (0x0000000F & $options) >> 0;
 		switch ($type) {
-			case 0x00:	$type = PHPExcel_Cell_DataValidation::TYPE_NONE;		break;
-			case 0x01:	$type = PHPExcel_Cell_DataValidation::TYPE_WHOLE;		break;
-			case 0x02:	$type = PHPExcel_Cell_DataValidation::TYPE_DECIMAL;		break;
-			case 0x03:	$type = PHPExcel_Cell_DataValidation::TYPE_LIST;		break;
-			case 0x04:	$type = PHPExcel_Cell_DataValidation::TYPE_DATE;		break;
-			case 0x05:	$type = PHPExcel_Cell_DataValidation::TYPE_TIME;		break;
-			case 0x06:	$type = PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH;	break;
-			case 0x07:	$type = PHPExcel_Cell_DataValidation::TYPE_CUSTOM;		break;
+			case 0x00:	$type = PHPExcel_Cell_DataValidation::TYPE_NONE; break;
+			case 0x01:	$type = PHPExcel_Cell_DataValidation::TYPE_WHOLE; break;
+			case 0x02:	$type = PHPExcel_Cell_DataValidation::TYPE_DECIMAL; break;
+			case 0x03:	$type = PHPExcel_Cell_DataValidation::TYPE_LIST; break;
+			case 0x04:	$type = PHPExcel_Cell_DataValidation::TYPE_DATE; break;
+			case 0x05:	$type = PHPExcel_Cell_DataValidation::TYPE_TIME; break;
+			case 0x06:	$type = PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH; break;
+			case 0x07:	$type = PHPExcel_Cell_DataValidation::TYPE_CUSTOM; break;
 		}
 
 		// bit: 4-6; mask: 0x00000070; error type
 		$errorStyle = (0x00000070 & $options) >> 4;
 		switch ($errorStyle) {
-			case 0x00:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;			break;
-			case 0x01:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_WARNING;		break;
-			case 0x02:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_INFORMATION;	break;
+			case 0x00:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; break;
+			case 0x01:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_WARNING; break;
+			case 0x02:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_INFORMATION; break;
 		}
 
 		// bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
@@ -4531,14 +4531,14 @@ 
 		// bit: 20-23; mask: 0x00F00000; condition operator
 		$operator = (0x00F00000 & $options) >> 20;
 		switch ($operator) {
-			case 0x00: $operator = PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN			;	break;
-			case 0x01: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN		;	break;
-			case 0x02: $operator = PHPExcel_Cell_DataValidation::OPERATOR_EQUAL				;	break;
-			case 0x03: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL			;	break;
-			case 0x04: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN		;	break;
-			case 0x05: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN			;	break;
-			case 0x06: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL;	break;
-			case 0x07: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL	;	break;
+			case 0x00: $operator = PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN; break;
+			case 0x01: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN; break;
+			case 0x02: $operator = PHPExcel_Cell_DataValidation::OPERATOR_EQUAL; break;
+			case 0x03: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL; break;
+			case 0x04: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN; break;
+			case 0x05: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN; break;
+			case 0x06: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL; break;
+			case 0x07: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL; break;
 		}
 
 		// offset: 4; size: var; title of the prompt box
@@ -4575,7 +4575,7 @@ 
 
 		// offset: var; size: $sz1; formula data for first condition (without size field)
 		$formula1 = substr($recordData, $offset, $sz1);
-		$formula1 = pack('v', $sz1) . $formula1; // prepend the length
+		$formula1 = pack('v', $sz1).$formula1; // prepend the length
 		try {
 			$formula1 = $this->_getFormulaFromStructure($formula1);
 
@@ -4597,7 +4597,7 @@ 
 
 		// offset: var; size: $sz2; formula data for second condition (without size field)
 		$formula2 = substr($recordData, $offset, $sz2);
-		$formula2 = pack('v', $sz2) . $formula2; // prepend the length
+		$formula2 = pack('v', $sz2).$formula2; // prepend the length
 		try {
 			$formula2 = $this->_getFormulaFromStructure($formula2);
 		} catch (Exception $e) {
@@ -4616,10 +4616,10 @@ 
 				$objValidation = $this->_phpSheet->getCell($coordinate)->getDataValidation();
 				$objValidation->setType($type);
 				$objValidation->setErrorStyle($errorStyle);
-				$objValidation->setAllowBlank((bool)$allowBlank);
-				$objValidation->setShowInputMessage((bool)$showInputMessage);
-				$objValidation->setShowErrorMessage((bool)$showErrorMessage);
-				$objValidation->setShowDropDown(!$suppressDropDown);
+				$objValidation->setAllowBlank((bool) $allowBlank);
+				$objValidation->setShowInputMessage((bool) $showInputMessage);
+				$objValidation->setShowErrorMessage((bool) $showErrorMessage);
+				$objValidation->setShowDropDown( ! $suppressDropDown);
 				$objValidation->setOperator($operator);
 				$objValidation->setErrorTitle($errorTitle);
 				$objValidation->setError($error);
@@ -4647,7 +4647,7 @@ 
 		// local pointer in record data
 		$offset = 0;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			// offset: 0; size: 2; repeated record identifier 0x0862
 
 			// offset: 2; size: 10; not used
@@ -4660,7 +4660,7 @@ 
 				case 0x14:
 					// offset: 16; size: 2; color index for sheet tab
 					$colorIndex = self::_GetInt2d($recordData, 16);
-					$color = self::_readColor($colorIndex,$this->_palette,$this->_version);
+					$color = self::_readColor($colorIndex, $this->_palette, $this->_version);
 					$this->_phpSheet->getTabColor()->setRGB($color['rgb']);
 					break;
 
@@ -4710,63 +4710,63 @@ 
 
 		// bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
 		$bool = (0x0001 & $options) >> 0;
-		$this->_phpSheet->getProtection()->setObjects(!$bool);
+		$this->_phpSheet->getProtection()->setObjects( ! $bool);
 
 		// bit: 1; mask 0x0002; edit scenarios
 		$bool = (0x0002 & $options) >> 1;
-		$this->_phpSheet->getProtection()->setScenarios(!$bool);
+		$this->_phpSheet->getProtection()->setScenarios( ! $bool);
 
 		// bit: 2; mask 0x0004; format cells
 		$bool = (0x0004 & $options) >> 2;
-		$this->_phpSheet->getProtection()->setFormatCells(!$bool);
+		$this->_phpSheet->getProtection()->setFormatCells( ! $bool);
 
 		// bit: 3; mask 0x0008; format columns
 		$bool = (0x0008 & $options) >> 3;
-		$this->_phpSheet->getProtection()->setFormatColumns(!$bool);
+		$this->_phpSheet->getProtection()->setFormatColumns( ! $bool);
 
 		// bit: 4; mask 0x0010; format rows
 		$bool = (0x0010 & $options) >> 4;
-		$this->_phpSheet->getProtection()->setFormatRows(!$bool);
+		$this->_phpSheet->getProtection()->setFormatRows( ! $bool);
 
 		// bit: 5; mask 0x0020; insert columns
 		$bool = (0x0020 & $options) >> 5;
-		$this->_phpSheet->getProtection()->setInsertColumns(!$bool);
+		$this->_phpSheet->getProtection()->setInsertColumns( ! $bool);
 
 		// bit: 6; mask 0x0040; insert rows
 		$bool = (0x0040 & $options) >> 6;
-		$this->_phpSheet->getProtection()->setInsertRows(!$bool);
+		$this->_phpSheet->getProtection()->setInsertRows( ! $bool);
 
 		// bit: 7; mask 0x0080; insert hyperlinks
 		$bool = (0x0080 & $options) >> 7;
-		$this->_phpSheet->getProtection()->setInsertHyperlinks(!$bool);
+		$this->_phpSheet->getProtection()->setInsertHyperlinks( ! $bool);
 
 		// bit: 8; mask 0x0100; delete columns
 		$bool = (0x0100 & $options) >> 8;
-		$this->_phpSheet->getProtection()->setDeleteColumns(!$bool);
+		$this->_phpSheet->getProtection()->setDeleteColumns( ! $bool);
 
 		// bit: 9; mask 0x0200; delete rows
 		$bool = (0x0200 & $options) >> 9;
-		$this->_phpSheet->getProtection()->setDeleteRows(!$bool);
+		$this->_phpSheet->getProtection()->setDeleteRows( ! $bool);
 
 		// bit: 10; mask 0x0400; select locked cells
 		$bool = (0x0400 & $options) >> 10;
-		$this->_phpSheet->getProtection()->setSelectLockedCells(!$bool);
+		$this->_phpSheet->getProtection()->setSelectLockedCells( ! $bool);
 
 		// bit: 11; mask 0x0800; sort cell range
 		$bool = (0x0800 & $options) >> 11;
-		$this->_phpSheet->getProtection()->setSort(!$bool);
+		$this->_phpSheet->getProtection()->setSort( ! $bool);
 
 		// bit: 12; mask 0x1000; auto filter
 		$bool = (0x1000 & $options) >> 12;
-		$this->_phpSheet->getProtection()->setAutoFilter(!$bool);
+		$this->_phpSheet->getProtection()->setAutoFilter( ! $bool);
 
 		// bit: 13; mask 0x2000; pivot tables
 		$bool = (0x2000 & $options) >> 13;
-		$this->_phpSheet->getProtection()->setPivotTables(!$bool);
+		$this->_phpSheet->getProtection()->setPivotTables( ! $bool);
 
 		// bit: 14; mask 0x4000; select unlocked cells
 		$bool = (0x4000 & $options) >> 14;
-		$this->_phpSheet->getProtection()->setSelectUnlockedCells(!$bool);
+		$this->_phpSheet->getProtection()->setSelectUnlockedCells( ! $bool);
 
 		// offset: 21; size: 2; not used
 	}
@@ -4788,7 +4788,7 @@ 
 		// local pointer in record data
 		$offset = 0;
 
-		if (!$this->_readDataOnly) {
+		if ( ! $this->_readDataOnly) {
 			$offset += 12;
 
 			// offset: 12; size: 2; shared feature type, 2 = enhanced protection, 4 = smart tag
@@ -5055,7 +5055,7 @@ 
 	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
 	 * @return string Human readable formula
 	 */
-	private function _getFormulaFromData($formulaData,  $additionalData = '', $baseCell = 'A1')
+	private function _getFormulaFromData($formulaData, $additionalData = '', $baseCell = 'A1')
 	{
 		// start parsing the formula data
 		$tokens = array();
@@ -5175,7 +5175,7 @@ 
 						$ops[] = array_pop($formulaStrings);
 					}
 					$ops = array_reverse($ops);
-					$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+					$formulaStrings[] = "$space1$space0{$token['data']['function']}(".implode(',', $ops).")";
 					unset($space0, $space1);
 				} else {
 					// add-in function
@@ -5185,7 +5185,7 @@ 
 					}
 					$ops = array_reverse($ops);
 					$function = array_pop($formulaStrings);
-					$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+					$formulaStrings[] = "$space1$space0$function(".implode(',', $ops).")";
 					unset($space0, $space1);
 				}
 				break;
@@ -5196,7 +5196,7 @@ 
 				break;
 			case 'tArray': // array constant
 				$constantArray = self::_readBIFF8ConstantArray($additionalData);
-				$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+				$formulaStrings[] = $space1.$space0.$constantArray['value'];
 				$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
 				unset($space0, $space1);
 				break;
@@ -5253,24 +5253,24 @@ 
 		$name = false; // initialize token name
 
 		switch ($id) {
-		case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
-		case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
-		case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
-		case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
-		case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
-		case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
-		case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
-		case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
-		case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
-		case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
-		case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
-		case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
-		case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
-		case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
-		case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
-		case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
-		case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
-		case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
+		case 0x03: $name = 'tAdd'; $size = 1; $data = '+'; break;
+		case 0x04: $name = 'tSub'; $size = 1; $data = '-'; break;
+		case 0x05: $name = 'tMul'; $size = 1; $data = '*'; break;
+		case 0x06: $name = 'tDiv'; $size = 1; $data = '/'; break;
+		case 0x07: $name = 'tPower'; $size = 1; $data = '^'; break;
+		case 0x08: $name = 'tConcat'; $size = 1; $data = '&'; break;
+		case 0x09: $name = 'tLT'; $size = 1; $data = '<'; break;
+		case 0x0A: $name = 'tLE'; $size = 1; $data = '<='; break;
+		case 0x0B: $name = 'tEQ'; $size = 1; $data = '='; break;
+		case 0x0C: $name = 'tGE'; $size = 1; $data = '>='; break;
+		case 0x0D: $name = 'tGT'; $size = 1; $data = '>'; break;
+		case 0x0E: $name = 'tNE'; $size = 1; $data = '<>'; break;
+		case 0x0F: $name = 'tIsect'; $size = 1; $data = ' '; break;
+		case 0x10: $name = 'tList'; $size = 1; $data = ','; break;
+		case 0x11: $name = 'tRange'; $size = 1; $data = ':'; break;
+		case 0x12: $name = 'tUplus'; $size = 1; $data = '+'; break;
+		case 0x13: $name = 'tUminus'; $size = 1; $data = '-'; break;
+		case 0x14: $name = 'tPercent'; $size = 1; $data = '%'; break;
 		case 0x15:	//	parenthesis
 			$name  = 'tParen';
 			$size  = 1;
@@ -5381,7 +5381,7 @@ 
 			$name = 'tNum';
 			$size = 9;
 			$data = self::_extractNumber(substr($formulaData, 1));
-			$data = str_replace(',', '.', (string)$data); // in case non-English locale
+			$data = str_replace(',', '.', (string) $data); // in case non-English locale
 			break;
 		case 0x20:	//	array constant
 		case 0x40:
@@ -5398,166 +5398,166 @@ 
 			$size = 3;
 			// offset: 1; size: 2; index to built-in sheet function
 			switch (self::_GetInt2d($formulaData, 1)) {
-			case   2: $function = 'ISNA'; 			$args = 1; 	break;
-			case   3: $function = 'ISERROR'; 		$args = 1; 	break;
-			case  10: $function = 'NA'; 			$args = 0; 	break;
-			case  15: $function = 'SIN'; 			$args = 1; 	break;
-			case  16: $function = 'COS'; 			$args = 1; 	break;
-			case  17: $function = 'TAN'; 			$args = 1; 	break;
-			case  18: $function = 'ATAN'; 			$args = 1; 	break;
-			case  19: $function = 'PI'; 			$args = 0; 	break;
-			case  20: $function = 'SQRT'; 			$args = 1; 	break;
-			case  21: $function = 'EXP'; 			$args = 1; 	break;
-			case  22: $function = 'LN'; 			$args = 1; 	break;
-			case  23: $function = 'LOG10'; 			$args = 1; 	break;
-			case  24: $function = 'ABS'; 			$args = 1; 	break;
-			case  25: $function = 'INT'; 			$args = 1; 	break;
-			case  26: $function = 'SIGN'; 			$args = 1; 	break;
-			case  27: $function = 'ROUND'; 			$args = 2; 	break;
-			case  30: $function = 'REPT'; 			$args = 2; 	break;
-			case  31: $function = 'MID'; 			$args = 3; 	break;
-			case  32: $function = 'LEN'; 			$args = 1; 	break;
-			case  33: $function = 'VALUE'; 			$args = 1; 	break;
-			case  34: $function = 'TRUE'; 			$args = 0; 	break;
-			case  35: $function = 'FALSE'; 			$args = 0; 	break;
-			case  38: $function = 'NOT'; 			$args = 1; 	break;
-			case  39: $function = 'MOD'; 			$args = 2;	break;
-			case  40: $function = 'DCOUNT'; 		$args = 3;	break;
-			case  41: $function = 'DSUM'; 			$args = 3;	break;
-			case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
-			case  43: $function = 'DMIN'; 			$args = 3;	break;
-			case  44: $function = 'DMAX'; 			$args = 3;	break;
-			case  45: $function = 'DSTDEV'; 		$args = 3;	break;
-			case  48: $function = 'TEXT'; 			$args = 2;	break;
-			case  61: $function = 'MIRR'; 			$args = 3;	break;
-			case  63: $function = 'RAND'; 			$args = 0;	break;
-			case  65: $function = 'DATE'; 			$args = 3;	break;
-			case  66: $function = 'TIME'; 			$args = 3;	break;
-			case  67: $function = 'DAY'; 			$args = 1;	break;
-			case  68: $function = 'MONTH'; 			$args = 1;	break;
-			case  69: $function = 'YEAR'; 			$args = 1;	break;
-			case  71: $function = 'HOUR'; 			$args = 1;	break;
-			case  72: $function = 'MINUTE'; 		$args = 1;	break;
-			case  73: $function = 'SECOND'; 		$args = 1;	break;
-			case  74: $function = 'NOW'; 			$args = 0;	break;
-			case  75: $function = 'AREAS'; 			$args = 1;	break;
-			case  76: $function = 'ROWS'; 			$args = 1;	break;
-			case  77: $function = 'COLUMNS'; 		$args = 1;	break;
-			case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
-			case  86: $function = 'TYPE'; 			$args = 1;	break;
-			case  97: $function = 'ATAN2'; 			$args = 2;	break;
-			case  98: $function = 'ASIN'; 			$args = 1;	break;
-			case  99: $function = 'ACOS'; 			$args = 1;	break;
-			case 105: $function = 'ISREF'; 			$args = 1;	break;
-			case 111: $function = 'CHAR'; 			$args = 1;	break;
-			case 112: $function = 'LOWER'; 			$args = 1;	break;
-			case 113: $function = 'UPPER'; 			$args = 1;	break;
-			case 114: $function = 'PROPER'; 		$args = 1;	break;
-			case 117: $function = 'EXACT'; 			$args = 2;	break;
-			case 118: $function = 'TRIM'; 			$args = 1;	break;
-			case 119: $function = 'REPLACE'; 		$args = 4;	break;
-			case 121: $function = 'CODE'; 			$args = 1;	break;
-			case 126: $function = 'ISERR'; 			$args = 1;	break;
-			case 127: $function = 'ISTEXT'; 		$args = 1;	break;
-			case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
-			case 129: $function = 'ISBLANK'; 		$args = 1;	break;
-			case 130: $function = 'T'; 				$args = 1;	break;
-			case 131: $function = 'N'; 				$args = 1;	break;
-			case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
-			case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
-			case 142: $function = 'SLN'; 			$args = 3;	break;
-			case 143: $function = 'SYD'; 			$args = 4;	break;
-			case 162: $function = 'CLEAN'; 			$args = 1;	break;
-			case 163: $function = 'MDETERM'; 		$args = 1;	break;
-			case 164: $function = 'MINVERSE'; 		$args = 1;	break;
-			case 165: $function = 'MMULT'; 			$args = 2;	break;
-			case 184: $function = 'FACT'; 			$args = 1;	break;
-			case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
-			case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
-			case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
-			case 196: $function = 'DVARP'; 			$args = 3;	break;
-			case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
-			case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
-			case 207: $function = 'REPLACEB'; 		$args = 4;	break;
-			case 210: $function = 'MIDB'; 			$args = 3;	break;
-			case 211: $function = 'LENB'; 			$args = 1;	break;
-			case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
-			case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
-			case 214: $function = 'ASC'; 			$args = 1;	break;
-			case 215: $function = 'DBCS'; 			$args = 1;	break;
-			case 221: $function = 'TODAY'; 			$args = 0;	break;
-			case 229: $function = 'SINH'; 			$args = 1;	break;
-			case 230: $function = 'COSH'; 			$args = 1;	break;
-			case 231: $function = 'TANH'; 			$args = 1;	break;
-			case 232: $function = 'ASINH'; 			$args = 1;	break;
-			case 233: $function = 'ACOSH'; 			$args = 1;	break;
-			case 234: $function = 'ATANH'; 			$args = 1;	break;
-			case 235: $function = 'DGET'; 			$args = 3;	break;
-			case 244: $function = 'INFO'; 			$args = 1;	break;
-			case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
-			case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
-			case 271: $function = 'GAMMALN'; 		$args = 1;	break;
-			case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
-			case 274: $function = 'CHIDIST'; 		$args = 2;	break;
-			case 275: $function = 'CHIINV'; 		$args = 2;	break;
-			case 276: $function = 'COMBIN'; 		$args = 2;	break;
-			case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
-			case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
-			case 279: $function = 'EVEN'; 			$args = 1;	break;
-			case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
-			case 281: $function = 'FDIST'; 			$args = 3;	break;
-			case 282: $function = 'FINV'; 			$args = 3;	break;
-			case 283: $function = 'FISHER'; 		$args = 1;	break;
-			case 284: $function = 'FISHERINV'; 		$args = 1;	break;
-			case 285: $function = 'FLOOR'; 			$args = 2;	break;
-			case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
-			case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
-			case 288: $function = 'CEILING'; 		$args = 2;	break;
-			case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
-			case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
-			case 291: $function = 'LOGINV';			$args = 3;	break;
-			case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
-			case 293: $function = 'NORMDIST';		$args = 4;	break;
-			case 294: $function = 'NORMSDIST';		$args = 1;	break;
-			case 295: $function = 'NORMINV';		$args = 3;	break;
-			case 296: $function = 'NORMSINV';		$args = 1;	break;
-			case 297: $function = 'STANDARDIZE';	$args = 3;	break;
-			case 298: $function = 'ODD';			$args = 1;	break;
-			case 299: $function = 'PERMUT';			$args = 2;	break;
-			case 300: $function = 'POISSON';		$args = 3;	break;
-			case 301: $function = 'TDIST';			$args = 3;	break;
-			case 302: $function = 'WEIBULL';		$args = 4;	break;
-			case 303: $function = 'SUMXMY2';		$args = 2;	break;
-			case 304: $function = 'SUMX2MY2';		$args = 2;	break;
-			case 305: $function = 'SUMX2PY2';		$args = 2;	break;
-			case 306: $function = 'CHITEST';		$args = 2;	break;
-			case 307: $function = 'CORREL';			$args = 2;	break;
-			case 308: $function = 'COVAR';			$args = 2;	break;
-			case 309: $function = 'FORECAST';		$args = 3;	break;
-			case 310: $function = 'FTEST';			$args = 2;	break;
-			case 311: $function = 'INTERCEPT';		$args = 2;	break;
-			case 312: $function = 'PEARSON';		$args = 2;	break;
-			case 313: $function = 'RSQ';			$args = 2;	break;
-			case 314: $function = 'STEYX';			$args = 2;	break;
-			case 315: $function = 'SLOPE';			$args = 2;	break;
-			case 316: $function = 'TTEST';			$args = 4;	break;
-			case 325: $function = 'LARGE';			$args = 2;	break;
-			case 326: $function = 'SMALL';			$args = 2;	break;
-			case 327: $function = 'QUARTILE';		$args = 2;	break;
-			case 328: $function = 'PERCENTILE';		$args = 2;	break;
-			case 331: $function = 'TRIMMEAN';		$args = 2;	break;
-			case 332: $function = 'TINV';			$args = 2;	break;
-			case 337: $function = 'POWER';			$args = 2;	break;
-			case 342: $function = 'RADIANS';		$args = 1;	break;
-			case 343: $function = 'DEGREES';		$args = 1;	break;
-			case 346: $function = 'COUNTIF';		$args = 2;	break;
-			case 347: $function = 'COUNTBLANK';		$args = 1;	break;
-			case 350: $function = 'ISPMT';			$args = 4;	break;
-			case 351: $function = 'DATEDIF';		$args = 3;	break;
-			case 352: $function = 'DATESTRING';		$args = 1;	break;
-			case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
-			case 360: $function = 'PHONETIC';		$args = 1;	break;
-			case 368: $function = 'BAHTTEXT';		$args = 1;	break;
+			case   2: $function = 'ISNA'; $args = 1; break;
+			case   3: $function = 'ISERROR'; $args = 1; break;
+			case  10: $function = 'NA'; $args = 0; break;
+			case  15: $function = 'SIN'; $args = 1; break;
+			case  16: $function = 'COS'; $args = 1; break;
+			case  17: $function = 'TAN'; $args = 1; break;
+			case  18: $function = 'ATAN'; $args = 1; break;
+			case  19: $function = 'PI'; $args = 0; break;
+			case  20: $function = 'SQRT'; $args = 1; break;
+			case  21: $function = 'EXP'; $args = 1; break;
+			case  22: $function = 'LN'; $args = 1; break;
+			case  23: $function = 'LOG10'; $args = 1; break;
+			case  24: $function = 'ABS'; $args = 1; break;
+			case  25: $function = 'INT'; $args = 1; break;
+			case  26: $function = 'SIGN'; $args = 1; break;
+			case  27: $function = 'ROUND'; $args = 2; break;
+			case  30: $function = 'REPT'; $args = 2; break;
+			case  31: $function = 'MID'; $args = 3; break;
+			case  32: $function = 'LEN'; $args = 1; break;
+			case  33: $function = 'VALUE'; $args = 1; break;
+			case  34: $function = 'TRUE'; $args = 0; break;
+			case  35: $function = 'FALSE'; $args = 0; break;
+			case  38: $function = 'NOT'; $args = 1; break;
+			case  39: $function = 'MOD'; $args = 2; break;
+			case  40: $function = 'DCOUNT'; $args = 3; break;
+			case  41: $function = 'DSUM'; $args = 3; break;
+			case  42: $function = 'DAVERAGE'; $args = 3; break;
+			case  43: $function = 'DMIN'; $args = 3; break;
+			case  44: $function = 'DMAX'; $args = 3; break;
+			case  45: $function = 'DSTDEV'; $args = 3; break;
+			case  48: $function = 'TEXT'; $args = 2; break;
+			case  61: $function = 'MIRR'; $args = 3; break;
+			case  63: $function = 'RAND'; $args = 0; break;
+			case  65: $function = 'DATE'; $args = 3; break;
+			case  66: $function = 'TIME'; $args = 3; break;
+			case  67: $function = 'DAY'; $args = 1; break;
+			case  68: $function = 'MONTH'; $args = 1; break;
+			case  69: $function = 'YEAR'; $args = 1; break;
+			case  71: $function = 'HOUR'; $args = 1; break;
+			case  72: $function = 'MINUTE'; $args = 1; break;
+			case  73: $function = 'SECOND'; $args = 1; break;
+			case  74: $function = 'NOW'; $args = 0; break;
+			case  75: $function = 'AREAS'; $args = 1; break;
+			case  76: $function = 'ROWS'; $args = 1; break;
+			case  77: $function = 'COLUMNS'; $args = 1; break;
+			case  83: $function = 'TRANSPOSE'; $args = 1; break;
+			case  86: $function = 'TYPE'; $args = 1; break;
+			case  97: $function = 'ATAN2'; $args = 2; break;
+			case  98: $function = 'ASIN'; $args = 1; break;
+			case  99: $function = 'ACOS'; $args = 1; break;
+			case 105: $function = 'ISREF'; $args = 1; break;
+			case 111: $function = 'CHAR'; $args = 1; break;
+			case 112: $function = 'LOWER'; $args = 1; break;
+			case 113: $function = 'UPPER'; $args = 1; break;
+			case 114: $function = 'PROPER'; $args = 1; break;
+			case 117: $function = 'EXACT'; $args = 2; break;
+			case 118: $function = 'TRIM'; $args = 1; break;
+			case 119: $function = 'REPLACE'; $args = 4; break;
+			case 121: $function = 'CODE'; $args = 1; break;
+			case 126: $function = 'ISERR'; $args = 1; break;
+			case 127: $function = 'ISTEXT'; $args = 1; break;
+			case 128: $function = 'ISNUMBER'; $args = 1; break;
+			case 129: $function = 'ISBLANK'; $args = 1; break;
+			case 130: $function = 'T'; $args = 1; break;
+			case 131: $function = 'N'; $args = 1; break;
+			case 140: $function = 'DATEVALUE'; $args = 1; break;
+			case 141: $function = 'TIMEVALUE'; $args = 1; break;
+			case 142: $function = 'SLN'; $args = 3; break;
+			case 143: $function = 'SYD'; $args = 4; break;
+			case 162: $function = 'CLEAN'; $args = 1; break;
+			case 163: $function = 'MDETERM'; $args = 1; break;
+			case 164: $function = 'MINVERSE'; $args = 1; break;
+			case 165: $function = 'MMULT'; $args = 2; break;
+			case 184: $function = 'FACT'; $args = 1; break;
+			case 189: $function = 'DPRODUCT'; $args = 3; break;
+			case 190: $function = 'ISNONTEXT'; $args = 1; break;
+			case 195: $function = 'DSTDEVP'; $args = 3; break;
+			case 196: $function = 'DVARP'; $args = 3; break;
+			case 198: $function = 'ISLOGICAL'; $args = 1; break;
+			case 199: $function = 'DCOUNTA'; $args = 3; break;
+			case 207: $function = 'REPLACEB'; $args = 4; break;
+			case 210: $function = 'MIDB'; $args = 3; break;
+			case 211: $function = 'LENB'; $args = 1; break;
+			case 212: $function = 'ROUNDUP'; $args = 2; break;
+			case 213: $function = 'ROUNDDOWN'; $args = 2; break;
+			case 214: $function = 'ASC'; $args = 1; break;
+			case 215: $function = 'DBCS'; $args = 1; break;
+			case 221: $function = 'TODAY'; $args = 0; break;
+			case 229: $function = 'SINH'; $args = 1; break;
+			case 230: $function = 'COSH'; $args = 1; break;
+			case 231: $function = 'TANH'; $args = 1; break;
+			case 232: $function = 'ASINH'; $args = 1; break;
+			case 233: $function = 'ACOSH'; $args = 1; break;
+			case 234: $function = 'ATANH'; $args = 1; break;
+			case 235: $function = 'DGET'; $args = 3; break;
+			case 244: $function = 'INFO'; $args = 1; break;
+			case 252: $function = 'FREQUENCY'; $args = 2; break;
+			case 261: $function = 'ERROR.TYPE'; $args = 1; break;
+			case 271: $function = 'GAMMALN'; $args = 1; break;
+			case 273: $function = 'BINOMDIST'; $args = 4; break;
+			case 274: $function = 'CHIDIST'; $args = 2; break;
+			case 275: $function = 'CHIINV'; $args = 2; break;
+			case 276: $function = 'COMBIN'; $args = 2; break;
+			case 277: $function = 'CONFIDENCE'; $args = 3; break;
+			case 278: $function = 'CRITBINOM'; $args = 3; break;
+			case 279: $function = 'EVEN'; $args = 1; break;
+			case 280: $function = 'EXPONDIST'; $args = 3; break;
+			case 281: $function = 'FDIST'; $args = 3; break;
+			case 282: $function = 'FINV'; $args = 3; break;
+			case 283: $function = 'FISHER'; $args = 1; break;
+			case 284: $function = 'FISHERINV'; $args = 1; break;
+			case 285: $function = 'FLOOR'; $args = 2; break;
+			case 286: $function = 'GAMMADIST'; $args = 4; break;
+			case 287: $function = 'GAMMAINV'; $args = 3; break;
+			case 288: $function = 'CEILING'; $args = 2; break;
+			case 289: $function = 'HYPGEOMDIST'; $args = 4; break;
+			case 290: $function = 'LOGNORMDIST'; $args = 3; break;
+			case 291: $function = 'LOGINV'; $args = 3; break;
+			case 292: $function = 'NEGBINOMDIST'; $args = 3; break;
+			case 293: $function = 'NORMDIST'; $args = 4; break;
+			case 294: $function = 'NORMSDIST'; $args = 1; break;
+			case 295: $function = 'NORMINV'; $args = 3; break;
+			case 296: $function = 'NORMSINV'; $args = 1; break;
+			case 297: $function = 'STANDARDIZE'; $args = 3; break;
+			case 298: $function = 'ODD'; $args = 1; break;
+			case 299: $function = 'PERMUT'; $args = 2; break;
+			case 300: $function = 'POISSON'; $args = 3; break;
+			case 301: $function = 'TDIST'; $args = 3; break;
+			case 302: $function = 'WEIBULL'; $args = 4; break;
+			case 303: $function = 'SUMXMY2'; $args = 2; break;
+			case 304: $function = 'SUMX2MY2'; $args = 2; break;
+			case 305: $function = 'SUMX2PY2'; $args = 2; break;
+			case 306: $function = 'CHITEST'; $args = 2; break;
+			case 307: $function = 'CORREL'; $args = 2; break;
+			case 308: $function = 'COVAR'; $args = 2; break;
+			case 309: $function = 'FORECAST'; $args = 3; break;
+			case 310: $function = 'FTEST'; $args = 2; break;
+			case 311: $function = 'INTERCEPT'; $args = 2; break;
+			case 312: $function = 'PEARSON'; $args = 2; break;
+			case 313: $function = 'RSQ'; $args = 2; break;
+			case 314: $function = 'STEYX'; $args = 2; break;
+			case 315: $function = 'SLOPE'; $args = 2; break;
+			case 316: $function = 'TTEST'; $args = 4; break;
+			case 325: $function = 'LARGE'; $args = 2; break;
+			case 326: $function = 'SMALL'; $args = 2; break;
+			case 327: $function = 'QUARTILE'; $args = 2; break;
+			case 328: $function = 'PERCENTILE'; $args = 2; break;
+			case 331: $function = 'TRIMMEAN'; $args = 2; break;
+			case 332: $function = 'TINV'; $args = 2; break;
+			case 337: $function = 'POWER'; $args = 2; break;
+			case 342: $function = 'RADIANS'; $args = 1; break;
+			case 343: $function = 'DEGREES'; $args = 1; break;
+			case 346: $function = 'COUNTIF'; $args = 2; break;
+			case 347: $function = 'COUNTBLANK'; $args = 1; break;
+			case 350: $function = 'ISPMT'; $args = 4; break;
+			case 351: $function = 'DATEDIF'; $args = 3; break;
+			case 352: $function = 'DATESTRING'; $args = 1; break;
+			case 353: $function = 'NUMBERSTRING'; $args = 2; break;
+			case 360: $function = 'PHONETIC'; $args = 1; break;
+			case 368: $function = 'BAHTTEXT'; $args = 1; break;
 			default:
 				throw new Exception('Unrecognized function in formula');
 				break;
@@ -5574,94 +5574,94 @@ 
 			// offset: 2: size: 2; index to built-in sheet function
 			$index = self::_GetInt2d($formulaData, 2);
 			switch ($index) {
-			case   0: $function = 'COUNT';			break;
-			case   1: $function = 'IF';				break;
-			case   4: $function = 'SUM';			break;
-			case   5: $function = 'AVERAGE';		break;
-			case   6: $function = 'MIN';			break;
-			case   7: $function = 'MAX';			break;
-			case   8: $function = 'ROW';			break;
-			case   9: $function = 'COLUMN';			break;
-			case  11: $function = 'NPV';			break;
-			case  12: $function = 'STDEV';			break;
-			case  13: $function = 'DOLLAR';			break;
-			case  14: $function = 'FIXED';			break;
-			case  28: $function = 'LOOKUP';			break;
-			case  29: $function = 'INDEX';			break;
-			case  36: $function = 'AND';			break;
-			case  37: $function = 'OR';				break;
-			case  46: $function = 'VAR';			break;
-			case  49: $function = 'LINEST';			break;
-			case  50: $function = 'TREND';			break;
-			case  51: $function = 'LOGEST';			break;
-			case  52: $function = 'GROWTH';			break;
-			case  56: $function = 'PV';				break;
-			case  57: $function = 'FV';				break;
-			case  58: $function = 'NPER';			break;
-			case  59: $function = 'PMT';			break;
-			case  60: $function = 'RATE';			break;
-			case  62: $function = 'IRR';			break;
-			case  64: $function = 'MATCH';			break;
-			case  70: $function = 'WEEKDAY';		break;
-			case  78: $function = 'OFFSET';			break;
-			case  82: $function = 'SEARCH';			break;
-			case 100: $function = 'CHOOSE';			break;
-			case 101: $function = 'HLOOKUP';		break;
-			case 102: $function = 'VLOOKUP';		break;
-			case 109: $function = 'LOG';			break;
-			case 115: $function = 'LEFT';			break;
-			case 116: $function = 'RIGHT';			break;
-			case 120: $function = 'SUBSTITUTE';		break;
-			case 124: $function = 'FIND';			break;
-			case 125: $function = 'CELL';			break;
-			case 144: $function = 'DDB';			break;
-			case 148: $function = 'INDIRECT';		break;
-			case 167: $function = 'IPMT';			break;
-			case 168: $function = 'PPMT';			break;
-			case 169: $function = 'COUNTA';			break;
-			case 183: $function = 'PRODUCT';		break;
-			case 193: $function = 'STDEVP';			break;
-			case 194: $function = 'VARP';			break;
-			case 197: $function = 'TRUNC';			break;
-			case 204: $function = 'USDOLLAR';		break;
-			case 205: $function = 'FINDB';			break;
-			case 206: $function = 'SEARCHB';		break;
-			case 208: $function = 'LEFTB';			break;
-			case 209: $function = 'RIGHTB';			break;
-			case 216: $function = 'RANK';			break;
-			case 219: $function = 'ADDRESS';		break;
-			case 220: $function = 'DAYS360';		break;
-			case 222: $function = 'VDB';			break;
-			case 227: $function = 'MEDIAN';			break;
-			case 228: $function = 'SUMPRODUCT';		break;
-			case 247: $function = 'DB';				break;
-			case 255: $function = '';				break;
-			case 269: $function = 'AVEDEV';			break;
-			case 270: $function = 'BETADIST';		break;
-			case 272: $function = 'BETAINV';		break;
-			case 317: $function = 'PROB';			break;
-			case 318: $function = 'DEVSQ';			break;
-			case 319: $function = 'GEOMEAN';		break;
-			case 320: $function = 'HARMEAN';		break;
-			case 321: $function = 'SUMSQ';			break;
-			case 322: $function = 'KURT';			break;
-			case 323: $function = 'SKEW';			break;
-			case 324: $function = 'ZTEST';			break;
-			case 329: $function = 'PERCENTRANK';	break;
-			case 330: $function = 'MODE';			break;
-			case 336: $function = 'CONCATENATE';	break;
-			case 344: $function = 'SUBTOTAL';		break;
-			case 345: $function = 'SUMIF';			break;
-			case 354: $function = 'ROMAN';			break;
-			case 358: $function = 'GETPIVOTDATA';	break;
-			case 359: $function = 'HYPERLINK';		break;
-			case 361: $function = 'AVERAGEA';		break;
-			case 362: $function = 'MAXA';			break;
-			case 363: $function = 'MINA';			break;
-			case 364: $function = 'STDEVPA';		break;
-			case 365: $function = 'VARPA';			break;
-			case 366: $function = 'STDEVA';			break;
-			case 367: $function = 'VARA';			break;
+			case   0: $function = 'COUNT'; break;
+			case   1: $function = 'IF'; break;
+			case   4: $function = 'SUM'; break;
+			case   5: $function = 'AVERAGE'; break;
+			case   6: $function = 'MIN'; break;
+			case   7: $function = 'MAX'; break;
+			case   8: $function = 'ROW'; break;
+			case   9: $function = 'COLUMN'; break;
+			case  11: $function = 'NPV'; break;
+			case  12: $function = 'STDEV'; break;
+			case  13: $function = 'DOLLAR'; break;
+			case  14: $function = 'FIXED'; break;
+			case  28: $function = 'LOOKUP'; break;
+			case  29: $function = 'INDEX'; break;
+			case  36: $function = 'AND'; break;
+			case  37: $function = 'OR'; break;
+			case  46: $function = 'VAR'; break;
+			case  49: $function = 'LINEST'; break;
+			case  50: $function = 'TREND'; break;
+			case  51: $function = 'LOGEST'; break;
+			case  52: $function = 'GROWTH'; break;
+			case  56: $function = 'PV'; break;
+			case  57: $function = 'FV'; break;
+			case  58: $function = 'NPER'; break;
+			case  59: $function = 'PMT'; break;
+			case  60: $function = 'RATE'; break;
+			case  62: $function = 'IRR'; break;
+			case  64: $function = 'MATCH'; break;
+			case  70: $function = 'WEEKDAY'; break;
+			case  78: $function = 'OFFSET'; break;
+			case  82: $function = 'SEARCH'; break;
+			case 100: $function = 'CHOOSE'; break;
+			case 101: $function = 'HLOOKUP'; break;
+			case 102: $function = 'VLOOKUP'; break;
+			case 109: $function = 'LOG'; break;
+			case 115: $function = 'LEFT'; break;
+			case 116: $function = 'RIGHT'; break;
+			case 120: $function = 'SUBSTITUTE'; break;
+			case 124: $function = 'FIND'; break;
+			case 125: $function = 'CELL'; break;
+			case 144: $function = 'DDB'; break;
+			case 148: $function = 'INDIRECT'; break;
+			case 167: $function = 'IPMT'; break;
+			case 168: $function = 'PPMT'; break;
+			case 169: $function = 'COUNTA'; break;
+			case 183: $function = 'PRODUCT'; break;
+			case 193: $function = 'STDEVP'; break;
+			case 194: $function = 'VARP'; break;
+			case 197: $function = 'TRUNC'; break;
+			case 204: $function = 'USDOLLAR'; break;
+			case 205: $function = 'FINDB'; break;
+			case 206: $function = 'SEARCHB'; break;
+			case 208: $function = 'LEFTB'; break;
+			case 209: $function = 'RIGHTB'; break;
+			case 216: $function = 'RANK'; break;
+			case 219: $function = 'ADDRESS'; break;
+			case 220: $function = 'DAYS360'; break;
+			case 222: $function = 'VDB'; break;
+			case 227: $function = 'MEDIAN'; break;
+			case 228: $function = 'SUMPRODUCT'; break;
+			case 247: $function = 'DB'; break;
+			case 255: $function = ''; break;
+			case 269: $function = 'AVEDEV'; break;
+			case 270: $function = 'BETADIST'; break;
+			case 272: $function = 'BETAINV'; break;
+			case 317: $function = 'PROB'; break;
+			case 318: $function = 'DEVSQ'; break;
+			case 319: $function = 'GEOMEAN'; break;
+			case 320: $function = 'HARMEAN'; break;
+			case 321: $function = 'SUMSQ'; break;
+			case 322: $function = 'KURT'; break;
+			case 323: $function = 'SKEW'; break;
+			case 324: $function = 'ZTEST'; break;
+			case 329: $function = 'PERCENTRANK'; break;
+			case 330: $function = 'MODE'; break;
+			case 336: $function = 'CONCATENATE'; break;
+			case 344: $function = 'SUBTOTAL'; break;
+			case 345: $function = 'SUMIF'; break;
+			case 354: $function = 'ROMAN'; break;
+			case 358: $function = 'GETPIVOTDATA'; break;
+			case 359: $function = 'HYPERLINK'; break;
+			case 361: $function = 'AVERAGEA'; break;
+			case 362: $function = 'MAXA'; break;
+			case 363: $function = 'MINA'; break;
+			case 364: $function = 'STDEVPA'; break;
+			case 365: $function = 'VARPA'; break;
+			case 366: $function = 'STDEVA'; break;
+			case 367: $function = 'VARA'; break;
 			default:
 				throw new Exception('Unrecognized function in formula');
 				break;
@@ -5791,7 +5791,7 @@ 
 			break;
 		// Unknown cases	// don't know how to deal with
 		default:
-			throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+			throw new Exception('Unrecognized token '.sprintf('%02X', $id).' in formula');
 			break;
 		}
 
@@ -5822,15 +5822,15 @@ 
 			$column = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($cellAddressStructure, 2));
 
 			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$column = '$' . $column;
+			if ( ! (0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
+				$column = '$'.$column;
 			}
 			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
+			if ( ! (0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
+				$row = '$'.$row;
 			}
 
-		return $column . $row;
+		return $column.$row;
 	}
 
 
@@ -5858,23 +5858,23 @@ 
 			$colIndex = 0x00FF & self::_GetInt2d($cellAddressStructure, 2);
 
 			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
+			if ( ! (0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
 				$column = PHPExcel_Cell::stringFromColumnIndex($colIndex);
-				$column = '$' . $column;
+				$column = '$'.$column;
 			} else {
 				$colIndex = ($colIndex <= 127) ? $colIndex : $colIndex - 256;
 				$column = PHPExcel_Cell::stringFromColumnIndex($baseCol + $colIndex);
 			}
 
 			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
+			if ( ! (0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
+				$row = '$'.$row;
 			} else {
 				$rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
 				$row = $baseRow + $rowIndex;
 			}
 
-		return $column . $row;
+		return $column.$row;
 	}
 
 
@@ -5981,13 +5981,13 @@ 
 		$fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 4));
 
 		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-			$fc = '$' . $fc;
+		if ( ! (0x4000 & self::_GetInt2d($subData, 4))) {
+			$fc = '$'.$fc;
 		}
 
 		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-			$fr = '$' . $fr;
+		if ( ! (0x8000 & self::_GetInt2d($subData, 4))) {
+			$fr = '$'.$fr;
 		}
 
 		// offset: 6; size: 2; index to last column or column offset + relative flags
@@ -5996,13 +5996,13 @@ 
 		$lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 6));
 
 		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-			$lc = '$' . $lc;
+		if ( ! (0x4000 & self::_GetInt2d($subData, 6))) {
+			$lc = '$'.$lc;
 		}
 
 		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-			$lr = '$' . $lr;
+		if ( ! (0x8000 & self::_GetInt2d($subData, 6))) {
+			$lr = '$'.$lr;
 		}
 
 		return "$fc$fr:$lc$lr";
@@ -6038,10 +6038,10 @@ 
 		$fcIndex = 0x00FF & self::_GetInt2d($subData, 4);
 
 		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
+		if ( ! (0x4000 & self::_GetInt2d($subData, 4))) {
 			// absolute column index
 			$fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
-			$fc = '$' . $fc;
+			$fc = '$'.$fc;
 		} else {
 			// column offset
 			$fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
@@ -6049,10 +6049,10 @@ 
 		}
 
 		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
+		if ( ! (0x8000 & self::_GetInt2d($subData, 4))) {
 			// absolute row index
 			$fr = $frIndex + 1;
-			$fr = '$' . $fr;
+			$fr = '$'.$fr;
 		} else {
 			// row offset
 			$frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
@@ -6067,10 +6067,10 @@ 
 		$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
 
 		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
+		if ( ! (0x4000 & self::_GetInt2d($subData, 6))) {
 			// absolute column index
 			$lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
-			$lc = '$' . $lc;
+			$lc = '$'.$lc;
 		} else {
 			// column offset
 			$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
@@ -6078,10 +6078,10 @@ 
 		}
 
 		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
+		if ( ! (0x8000 & self::_GetInt2d($subData, 6))) {
 			// absolute row index
 			$lr = $lrIndex + 1;
-			$lr = '$' . $lr;
+			$lr = '$'.$lr;
 		} else {
 			// row offset
 			$lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
@@ -6236,7 +6236,7 @@ 
 			}
 			$matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
 		}
-		$matrix = '{' . implode(';', $matrixChunks) . '}';
+		$matrix = '{'.implode(';', $matrixChunks).'}';
 
 		return array(
 			'value' => $matrix,
@@ -6271,7 +6271,7 @@ 
 		case 0x02: // string value
 			// offset: 1; size: var; Unicode string, 16-bit string length
 			$string = self::_readUnicodeStringLong(substr($valueData, 1));
-			$value = '"' . $string['value'] . '"';
+			$value = '"'.$string['value'].'"';
 			$size = 1 + $string['size'];
 			break;
 		case 0x04: // boolean
@@ -6430,7 +6430,7 @@ 
 		// offset: 0: size: 1; option flags
 
 			// bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
-			$isCompressed = !((0x01 & ord($subData[0])) >> 0);
+			$isCompressed = ! ((0x01 & ord($subData[0])) >> 0);
 
 			// bit: 2; mask: 0x04; Asian phonetic settings
 			$hasAsian = (0x04) & ord($subData[0]) >> 2;
@@ -6459,7 +6459,7 @@ 
 	 */
 	private static function _UTF8toExcelDoubleQuoted($value)
 	{
-		return '"' . str_replace('"', '""', $value) . '"';
+		return '"'.str_replace('"', '""', $value).'"';
 	}
 
 
@@ -6478,13 +6478,13 @@ 
 		$mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
 		$mantissalow1 = ($rknumlow & 0x80000000) >> 31;
 		$mantissalow2 = ($rknumlow & 0x7fffffff);
-		$value = $mantissa / pow( 2 , (20 - $exp));
+		$value = $mantissa / pow(2, (20 - $exp));
 
 		if ($mantissalow1 != 0) {
-			$value += 1 / pow (2 , (21 - $exp));
+			$value += 1 / pow(2, (21 - $exp));
 		}
 
-		$value += $mantissalow2 / pow (2 , (52 - $exp));
+		$value += $mantissalow2 / pow(2, (52 - $exp));
 		if ($sign) {
 			$value *= -1;
 		}
@@ -6506,7 +6506,7 @@ 
 			$sign = ($rknum & 0x80000000) >> 31;
 			$exp = ($rknum & 0x7ff00000) >> 20;
 			$mantissa = (0x100000 | ($rknum & 0x000ffffc));
-			$value = $mantissa / pow( 2 , (20- ($exp - 1023)));
+			$value = $mantissa / pow(2, (20 - ($exp - 1023)));
 			if ($sign) {
 				$value = -1 * $value;
 			}
@@ -6547,7 +6547,7 @@ 
 		$uncompressedString = '';
 		$strLen = strlen($string);
 		for ($i = 0; $i < $strLen; ++$i) {
-			$uncompressedString .= $string[$i] . "\0";
+			$uncompressedString .= $string[$i]."\0";
 		}
 
 		return $uncompressedString;
@@ -6575,7 +6575,7 @@ 
 	 */
 	public static function _GetInt2d($data, $pos)
 	{
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
+		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
 	}
 
 
@@ -6598,7 +6598,7 @@ 
 		} else {
 			$_ord_24 = ($_or_24 & 127) << 24;
 		}
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
+		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
 	}
 
 
@@ -6609,7 +6609,7 @@ 
 	 * @param array $palette Color palette
 	 * @return array RGB color value, example: array('rgb' => 'FF0000')
 	 */
-	private static function _readColor($color,$palette,$version)
+	private static function _readColor($color, $palette, $version)
 	{
 		if ($color <= 0x07 || $color >= 0x40) {
 			// special built-in color
@@ -6703,13 +6703,13 @@ 
 	private static function _mapErrorCode($subData)
 	{
 		switch ($subData) {
-			case 0x00: return '#NULL!';		break;
-			case 0x07: return '#DIV/0!';	break;
-			case 0x0F: return '#VALUE!';	break;
-			case 0x17: return '#REF!';		break;
-			case 0x1D: return '#NAME?';		break;
-			case 0x24: return '#NUM!';		break;
-			case 0x2A: return '#N/A';		break;
+			case 0x00: return '#NULL!'; break;
+			case 0x07: return '#DIV/0!'; break;
+			case 0x0F: return '#VALUE!'; break;
+			case 0x17: return '#REF!'; break;
+			case 0x1D: return '#NAME?'; break;
+			case 0x24: return '#NUM!'; break;
+			case 0x2A: return '#N/A'; break;
 			default: return false;
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -1768,12 +1768,16 @@
 				// bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
 				// bit: 1; mask 0x0002; italic
 				$isItalic = (0x0002 & self::_GetInt2d($recordData, 2)) >> 1;
-				if ($isItalic) $objFont->setItalic(true);
+				if ($isItalic) {
+					$objFont->setItalic(true);
+				}
 
 				// bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
 				// bit: 3; mask 0x0008; strike
 				$isStrike = (0x0008 & self::_GetInt2d($recordData, 2)) >> 3;
-				if ($isStrike) $objFont->setStrikethrough(true);
+				if ($isStrike) {
+					$objFont->setStrikethrough(true);
+				}
 
 			// offset: 4; size: 2; colour index
 			$colorIndex = self::_GetInt2d($recordData, 4);

app/Vendor/PHPExcel/PHPExcel/Reader/Gnumeric.php

Doc Comments +4 added lines, -1 removed lines

@@ -189,7 +189,7 @@ 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @return 	boolean
 	 * @throws Exception
 	 */
@@ -268,6 +268,9 @@ 
 	}
 
 
+	/**
+	 * @param string $filename
+	 */
 	private function _gzfileGetContents($filename) {
 		$file = @gzopen($filename, 'rb');
 		if ($file !== false) {

Indentation +1 added lines, -1 removed lines

@@ -363,7 +363,7 @@
 		//	Document Properties are held differently, depending on the version of Gnumeric
 		if (isset($namespacesMeta['office'])) {
 			$officeXML = $xml->children($namespacesMeta['office']);
-		    $officeDocXML = $officeXML->{'document-meta'};
+			$officeDocXML = $officeXML->{'document-meta'};
 			$officeDocMetaXML = $officeDocXML->meta;
 
 			foreach($officeDocMetaXML as $officePropertyData) {

Spacing +64 added lines, -64 removed lines

@@ -27,12 +27,12 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 /**
@@ -89,7 +89,7 @@ 
 	 * Create a new PHPExcel_Reader_Gnumeric
 	 */
 	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
 		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
 	}
 
@@ -196,12 +196,12 @@ 
 	public function canRead($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		// Check if gzlib functions are available
-		if (!function_exists('gzread')) {
+		if ( ! function_exists('gzread')) {
 			throw new Exception("gzlib library is not enabled");
 		}
 
@@ -227,8 +227,8 @@ 
 	public function listWorksheetInfo($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$gFileData = $this->_gzfileGetContents($pFilename);
@@ -272,7 +272,7 @@ 
 		$file = @gzopen($filename, 'rb');
 		if ($file !== false) {
 			$data = '';
-			while (!gzeof($file)) {
+			while ( ! gzeof($file)) {
 				$data .= gzread($file, 1024);
 			}
 			gzclose($file);
@@ -307,8 +307,8 @@ 
 	public function listWorksheetNames($pFilename)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$gFileData = $this->_gzfileGetContents($pFilename);
@@ -320,7 +320,7 @@ 
 
 		$worksheetNames = array();
 
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
+		foreach ($gnmXML->Sheets->Sheet as $sheet) {
 			$worksheetNames[] = (string) $sheet->Name;
 		}
 
@@ -339,8 +339,8 @@ 
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
 		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		if ( ! file_exists($pFilename)) {
+			throw new Exception("Could not open ".$pFilename." for reading! File does not exist.");
 		}
 
 		$timezoneObj = new DateTimeZone('Europe/London');
@@ -366,13 +366,13 @@ 
 		    $officeDocXML = $officeXML->{'document-meta'};
 			$officeDocMetaXML = $officeDocXML->meta;
 
-			foreach($officeDocMetaXML as $officePropertyData) {
+			foreach ($officeDocMetaXML as $officePropertyData) {
 
 				$officePropertyDC = array();
 				if (isset($namespacesMeta['dc'])) {
 					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
 				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
+				foreach ($officePropertyDC as $propertyName => $propertyValue) {
 					$propertyValue = (string) $propertyValue;
 					switch ($propertyName) {
 						case 'title' :
@@ -399,7 +399,7 @@ 
 				if (isset($namespacesMeta['meta'])) {
 					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
 				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
+				foreach ($officePropertyMeta as $propertyName => $propertyValue) {
 					$attributes = $propertyValue->attributes($namespacesMeta['meta']);
 					$propertyValue = (string) $propertyValue;
 					switch ($propertyName) {
@@ -416,7 +416,7 @@ 
 								$docProps->setModified($creationDate);
 								break;
 						case 'user-defined' :
-								list(,$attrName) = explode(':',$attributes['name']);
+								list(,$attrName) = explode(':', $attributes['name']);
 								switch ($attrName) {
 									case 'publisher' :
 											$docProps->setCompany(trim($propertyValue));
@@ -433,7 +433,7 @@ 
 				}
 			}
 		} elseif (isset($gnmXML->Summary)) {
-			foreach($gnmXML->Summary->Item as $summaryItem) {
+			foreach ($gnmXML->Summary->Item as $summaryItem) {
 				$propertyName = $summaryItem->name;
 				$propertyValue = $summaryItem->{'val-string'};
 				switch ($propertyName) {
@@ -464,10 +464,10 @@ 
 		}
 
 		$worksheetID = 0;
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
+		foreach ($gnmXML->Sheets->Sheet as $sheet) {
 			$worksheetName = (string) $sheet->Name;
 //			echo '<b>Worksheet: ',$worksheetName,'</b><br />';
-			if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
+			if ((isset($this->_loadSheetsOnly)) && ( ! in_array($worksheetName, $this->_loadSheetsOnly))) {
 				continue;
 			}
 
@@ -479,19 +479,19 @@ 
 			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
 			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
 			//		name in line with the formula, not the reverse
-			$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+			$objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
 
-			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->PrintInformation))) {
 				if (isset($sheet->PrintInformation->Margins)) {
-					foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
+					foreach ($sheet->PrintInformation->Margins->children('gnm', TRUE) as $key => $margin) {
 						$marginAttributes = $margin->attributes();
-						$marginSize = 72 / 100;	//	Default
-						switch($marginAttributes['PrefUnit']) {
+						$marginSize = 72 / 100; //	Default
+						switch ($marginAttributes['PrefUnit']) {
 							case 'mm' :
 								$marginSize = intval($marginAttributes['Points']) / 100;
 								break;
 						}
-						switch($key) {
+						switch ($key) {
 							case 'top' :
 								$objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
 								break;
@@ -515,7 +515,7 @@ 
 				}
 			}
 
-			foreach($sheet->Cells->Cell as $cell) {
+			foreach ($sheet->Cells->Cell as $cell) {
 				$cellAttributes = $cell->attributes();
 				$row = (int) $cellAttributes->Row + 1;
 				$column = (int) $cellAttributes->Col;
@@ -527,7 +527,7 @@ 
 
 				// Read cell?
 				if ($this->getReadFilter() !== NULL) {
-					if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
+					if ( ! $this->getReadFilter()->readCell($column, $row, $worksheetName)) {
 						continue;
 					}
 				}
@@ -541,7 +541,7 @@ 
 				if ($ExprID > '') {
 					if (((string) $cell) > '') {
 
-						$this->_expressions[$ExprID] = array( 'column'	=> $cellAttributes->Col,
+						$this->_expressions[$ExprID] = array('column'	=> $cellAttributes->Col,
 															  'row'		=> $cellAttributes->Row,
 															  'formula'	=> (string) $cell
 															);
@@ -549,7 +549,7 @@ 
 					} else {
 						$expression = $this->_expressions[$ExprID];
 
-						$cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
+						$cell = $this->_referenceHelper->updateFormulaReferences($expression['formula'],
 																				  'A1',
 																				  $cellAttributes->Col - $expression['column'],
 																				  $cellAttributes->Row - $expression['row'],
@@ -560,7 +560,7 @@ 
 					}
 					$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
 				} else {
-					switch($ValueType) {
+					switch ($ValueType) {
 						case '10' :		//	NULL
 							$type = PHPExcel_Cell_DataType::TYPE_NULL;
 							break;
@@ -583,23 +583,23 @@ 
 						case '80' :		//	Array
 					}
 				}
-				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
+				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
-				foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Objects))) {
+				foreach ($sheet->Objects->children('gnm', TRUE) as $key => $comment) {
 					$commentAttributes = $comment->attributes();
 					//	Only comment objects are handled at the moment
 					if ($commentAttributes->Text) {
-						$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
-															->setAuthor( (string)$commentAttributes->Author )
-															->setText($this->_parseRichText((string)$commentAttributes->Text) );
+						$objPHPExcel->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)
+															->setAuthor((string) $commentAttributes->Author)
+															->setText($this->_parseRichText((string) $commentAttributes->Text));
 					}
 				}
 			}
 //			echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
 //
-			foreach($sheet->Styles->StyleRegion as $styleRegion) {
+			foreach ($sheet->Styles->StyleRegion as $styleRegion) {
 				$styleAttributes = $styleRegion->attributes();
 				if (($styleAttributes['startRow'] <= $maxRow) &&
 					($styleAttributes['startCol'] <= $maxCol)) {
@@ -619,13 +619,13 @@ 
 //					echo '<br />';
 
 					//	We still set the number format mask for date/time values, even if _readDataOnly is true
-					if ((!$this->_readDataOnly) ||
+					if (( ! $this->_readDataOnly) ||
 						(PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
 						$styleArray = array();
 						$styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
 						//	If _readDataOnly is false, we set all formatting information
-						if (!$this->_readDataOnly) {
-							switch($styleAttributes['HAlign']) {
+						if ( ! $this->_readDataOnly) {
+							switch ($styleAttributes['HAlign']) {
 								case '1' :
 									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
 									break;
@@ -647,7 +647,7 @@ 
 									break;
 							}
 
-							switch($styleAttributes['VAlign']) {
+							switch ($styleAttributes['VAlign']) {
 								case '1' :
 									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
 									break;
@@ -674,7 +674,7 @@ 
 								$styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
 								$RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
 								$styleArray['fill']['endcolor']['rgb'] = $RGB2;
-								switch($shade) {
+								switch ($shade) {
 									case '1' :
 										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
 										break;
@@ -746,7 +746,7 @@ 
 							$styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
 							$styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
 							$styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
-							switch($fontAttributes['Underline']) {
+							switch ($fontAttributes['Underline']) {
 								case '1' :
 									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
 									break;
@@ -763,7 +763,7 @@ 
 									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
 									break;
 							}
-							switch($fontAttributes['Script']) {
+							switch ($fontAttributes['Script']) {
 								case '1' :
 									$styleArray['font']['superScript'] = True;
 									break;
@@ -808,22 +808,22 @@ 
 				}
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Cols))) {
 				//	Column Widths
 				$columnAttributes = $sheet->Cols->attributes();
-				$defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
+				$defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
 				$c = 0;
-				foreach($sheet->Cols->ColInfo as $columnOverride) {
+				foreach ($sheet->Cols->ColInfo as $columnOverride) {
 					$columnAttributes = $columnOverride->attributes();
 					$column = $columnAttributes['No'];
-					$columnWidth = $columnAttributes['Unit']  / 5.4;
+					$columnWidth = $columnAttributes['Unit'] / 5.4;
 					$hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
 					$columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
 					while ($c < $column) {
 						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
 						++$c;
 					}
-					while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
+					while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
 						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
 						if ($hidden) {
 							$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
@@ -837,13 +837,13 @@ 
 				}
 			}
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
+			if (( ! $this->_readDataOnly) && (isset($sheet->Rows))) {
 				//	Row Heights
 				$rowAttributes = $sheet->Rows->attributes();
 				$defaultHeight = $rowAttributes['DefaultSizePts'];
 				$r = 0;
 
-				foreach($sheet->Rows->RowInfo as $rowOverride) {
+				foreach ($sheet->Rows->RowInfo as $rowOverride) {
 					$rowAttributes = $rowOverride->attributes();
 					$row = $rowAttributes['No'];
 					$rowHeight = $rowAttributes['Unit'];
@@ -853,7 +853,7 @@ 
 						++$r;
 						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
 					}
-					while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
+					while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
 						++$r;
 						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
 						if ($hidden) {
@@ -869,7 +869,7 @@ 
 
 			//	Handle Merged Cells in this worksheet
 			if (isset($sheet->MergedRegions)) {
-				foreach($sheet->MergedRegions->Merge as $mergeCells) {
+				foreach ($sheet->MergedRegions->Merge as $mergeCells) {
 					$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
 				}
 			}
@@ -879,18 +879,18 @@ 
 
 		//	Loop through definedNames (global named ranges)
 		if (isset($gnmXML->Names)) {
-			foreach($gnmXML->Names->Name as $namedRange) {
+			foreach ($gnmXML->Names->Name as $namedRange) {
 				$name = (string) $namedRange->name;
 				$range = (string) $namedRange->value;
 				if (stripos($range, '#REF!') !== false) {
 					continue;
 				}
 
-				$range = explode('!',$range);
-				$range[0] = trim($range[0],"'");;
+				$range = explode('!', $range);
+				$range[0] = trim($range[0], "'"); ;
 				if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
 					$extractedRange = str_replace('$', '', $range[1]);
-					$objPHPExcel->addNamedRange( new PHPExcel_NamedRange($name, $worksheet, $extractedRange) );
+					$objPHPExcel->addNamedRange(new PHPExcel_NamedRange($name, $worksheet, $extractedRange));
 				}
 			}
 		}
@@ -967,10 +967,10 @@ 
 
 
 	private static function _parseGnumericColour($gnmColour) {
-		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
-		$gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmG = substr(str_pad($gnmG,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmB = substr(str_pad($gnmB,4,'0',STR_PAD_RIGHT),0,2);
+		list($gnmR, $gnmG, $gnmB) = explode(':', $gnmColour);
+		$gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
+		$gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
+		$gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
 		$RGB = $gnmR.$gnmG.$gnmB;
 //		echo 'Excel Colour: ',$RGB,'<br />';
 		return $RGB;

Braces +6 added lines, -2 removed lines

@@ -520,8 +520,12 @@
 				$row = (int) $cellAttributes->Row + 1;
 				$column = (int) $cellAttributes->Col;
 
-				if ($row > $maxRow) $maxRow = $row;
-				if ($column > $maxCol) $maxCol = $column;
+				if ($row > $maxRow) {
+					$maxRow = $row;
+				}
+				if ($column > $maxCol) {
+					$maxCol = $column;
+				}
 
 				$column = PHPExcel_Cell::stringFromColumnIndex($column);