reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Style/Conditional.php

Doc Comments +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
     /**
      * Get Condition type
      *
-     * @return string
+     * @return integer
      */
     public function getConditionType() {
     	return $this->_conditionType;
@@ -126,7 +126,7 @@ 
     /**
      * Get Operator type
      *
-     * @return string
+     * @return integer
      */
     public function getOperatorType() {
     	return $this->_operatorType;

Spacing +17 added lines, -17 removed lines

@@ -36,24 +36,24 @@ 
 class PHPExcel_Style_Conditional implements PHPExcel_IComparable
 {
 	/* Condition types */
-	const CONDITION_NONE					= 'none';
-	const CONDITION_CELLIS					= 'cellIs';
+	const CONDITION_NONE = 'none';
+	const CONDITION_CELLIS = 'cellIs';
 	const CONDITION_CONTAINSTEXT			= 'containsText';
 	const CONDITION_EXPRESSION 				= 'expression';
 
 	/* Operator types */
 	const OPERATOR_NONE						= '';
-	const OPERATOR_BEGINSWITH				= 'beginsWith';
-	const OPERATOR_ENDSWITH					= 'endsWith';
+	const OPERATOR_BEGINSWITH = 'beginsWith';
+	const OPERATOR_ENDSWITH = 'endsWith';
 	const OPERATOR_EQUAL					= 'equal';
-	const OPERATOR_GREATERTHAN				= 'greaterThan';
-	const OPERATOR_GREATERTHANOREQUAL		= 'greaterThanOrEqual';
+	const OPERATOR_GREATERTHAN = 'greaterThan';
+	const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
 	const OPERATOR_LESSTHAN					= 'lessThan';
-	const OPERATOR_LESSTHANOREQUAL			= 'lessThanOrEqual';
+	const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
 	const OPERATOR_NOTEQUAL					= 'notEqual';
-	const OPERATOR_CONTAINSTEXT				= 'containsText';
-	const OPERATOR_NOTCONTAINS				= 'notContains';
-	const OPERATOR_BETWEEN					= 'between';
+	const OPERATOR_CONTAINSTEXT = 'containsText';
+	const OPERATOR_NOTCONTAINS = 'notContains';
+	const OPERATOR_BETWEEN = 'between';
 
 	/**
 	 * Condition type
@@ -96,11 +96,11 @@ 
     public function __construct()
     {
     	// Initialise values
-    	$this->_conditionType		= PHPExcel_Style_Conditional::CONDITION_NONE;
-    	$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
-    	$this->_text    			= null;
-    	$this->_condition			= array();
-    	$this->_style				= new PHPExcel_Style();
+    	$this->_conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
+    	$this->_operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE;
+    	$this->_text = null;
+    	$this->_condition = array();
+    	$this->_style = new PHPExcel_Style();
     }
 
     /**
@@ -185,7 +185,7 @@ 
      * @return PHPExcel_Style_Conditional
      */
     public function setCondition($pValue = '') {
-    	if (!is_array($pValue))
+    	if ( ! is_array($pValue))
     		$pValue = array($pValue);
 
     	return $this->setConditions($pValue);
@@ -207,7 +207,7 @@ 
      * @return PHPExcel_Style_Conditional
      */
     public function setConditions($pValue) {
-    	if (!is_array($pValue))
+    	if ( ! is_array($pValue))
     		$pValue = array($pValue);
 
     	$this->_condition = $pValue;

Braces +6 added lines, -4 removed lines

@@ -185,8 +185,9 @@ 
      * @return PHPExcel_Style_Conditional
      */
     public function setCondition($pValue = '') {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
+    	if (!is_array($pValue)) {
+    	    		$pValue = array($pValue);
+    	}
 
     	return $this->setConditions($pValue);
     }
@@ -207,8 +208,9 @@ 
      * @return PHPExcel_Style_Conditional
      */
     public function setConditions($pValue) {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
+    	if (!is_array($pValue)) {
+    	    		$pValue = array($pValue);
+    	}
 
     	$this->_condition = $pValue;
     	return $this;

Indentation +145 added lines, -145 removed lines

@@ -90,161 +90,161 @@ 
 	 */
 	private $_style;
 
-    /**
-     * Create a new PHPExcel_Style_Conditional
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_conditionType		= PHPExcel_Style_Conditional::CONDITION_NONE;
-    	$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
-    	$this->_text    			= null;
-    	$this->_condition			= array();
-    	$this->_style				= new PHPExcel_Style();
-    }
+	/**
+	 * Create a new PHPExcel_Style_Conditional
+	 */
+	public function __construct()
+	{
+		// Initialise values
+		$this->_conditionType		= PHPExcel_Style_Conditional::CONDITION_NONE;
+		$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
+		$this->_text    			= null;
+		$this->_condition			= array();
+		$this->_style				= new PHPExcel_Style();
+	}
 
-    /**
-     * Get Condition type
-     *
-     * @return string
-     */
-    public function getConditionType() {
-    	return $this->_conditionType;
-    }
+	/**
+	 * Get Condition type
+	 *
+	 * @return string
+	 */
+	public function getConditionType() {
+		return $this->_conditionType;
+	}
 
-    /**
-     * Set Condition type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional condition type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
-    	$this->_conditionType = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Condition type
+	 *
+	 * @param string $pValue	PHPExcel_Style_Conditional condition type
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
+		$this->_conditionType = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Operator type
-     *
-     * @return string
-     */
-    public function getOperatorType() {
-    	return $this->_operatorType;
-    }
+	/**
+	 * Get Operator type
+	 *
+	 * @return string
+	 */
+	public function getOperatorType() {
+		return $this->_operatorType;
+	}
 
-    /**
-     * Set Operator type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional operator type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
-    	$this->_operatorType = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Operator type
+	 *
+	 * @param string $pValue	PHPExcel_Style_Conditional operator type
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
+		$this->_operatorType = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get text
-     *
-     * @return string
-     */
-    public function getText() {
-        return $this->_text;
-    }
+	/**
+	 * Get text
+	 *
+	 * @return string
+	 */
+	public function getText() {
+		return $this->_text;
+	}
 
-    /**
-     * Set text
-     *
-     * @param string $value
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setText($value = null) {
-           $this->_text = $value;
-           return $this;
-    }
+	/**
+	 * Set text
+	 *
+	 * @param string $value
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setText($value = null) {
+		   $this->_text = $value;
+		   return $this;
+	}
 
-    /**
-     * Get Condition
-     *
-     * @deprecated Deprecated, use getConditions instead
-     * @return string
-     */
-    public function getCondition() {
-    	if (isset($this->_condition[0])) {
-    		return $this->_condition[0];
-    	}
+	/**
+	 * Get Condition
+	 *
+	 * @deprecated Deprecated, use getConditions instead
+	 * @return string
+	 */
+	public function getCondition() {
+		if (isset($this->_condition[0])) {
+			return $this->_condition[0];
+		}
 
-    	return '';
-    }
+		return '';
+	}
 
-    /**
-     * Set Condition
-     *
-     * @deprecated Deprecated, use setConditions instead
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setCondition($pValue = '') {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
+	/**
+	 * Set Condition
+	 *
+	 * @deprecated Deprecated, use setConditions instead
+	 * @param string $pValue	Condition
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setCondition($pValue = '') {
+		if (!is_array($pValue))
+			$pValue = array($pValue);
 
-    	return $this->setConditions($pValue);
-    }
+		return $this->setConditions($pValue);
+	}
 
-    /**
-     * Get Conditions
-     *
-     * @return string[]
-     */
-    public function getConditions() {
-    	return $this->_condition;
-    }
+	/**
+	 * Get Conditions
+	 *
+	 * @return string[]
+	 */
+	public function getConditions() {
+		return $this->_condition;
+	}
 
-    /**
-     * Set Conditions
-     *
-     * @param string[] $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditions($pValue) {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
+	/**
+	 * Set Conditions
+	 *
+	 * @param string[] $pValue	Condition
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setConditions($pValue) {
+		if (!is_array($pValue))
+			$pValue = array($pValue);
 
-    	$this->_condition = $pValue;
-    	return $this;
-    }
+		$this->_condition = $pValue;
+		return $this;
+	}
 
-    /**
-     * Add Condition
-     *
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function addCondition($pValue = '') {
-    	$this->_condition[] = $pValue;
-    	return $this;
-    }
+	/**
+	 * Add Condition
+	 *
+	 * @param string $pValue	Condition
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function addCondition($pValue = '') {
+		$this->_condition[] = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Style
-     *
-     * @return PHPExcel_Style
-     */
-    public function getStyle() {
-    	return $this->_style;
-    }
+	/**
+	 * Get Style
+	 *
+	 * @return PHPExcel_Style
+	 */
+	public function getStyle() {
+		return $this->_style;
+	}
 
-    /**
-     * Set Style
-     *
-     * @param 	PHPExcel_Style $pValue
-     * @throws 	Exception
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setStyle(PHPExcel_Style $pValue = null) {
+	/**
+	 * Set Style
+	 *
+	 * @param 	PHPExcel_Style $pValue
+	 * @throws 	Exception
+	 * @return PHPExcel_Style_Conditional
+	 */
+	public function setStyle(PHPExcel_Style $pValue = null) {
    		$this->_style = $pValue;
    		return $this;
-    }
+	}
 
 	/**
 	 * Get hash code
@@ -252,14 +252,14 @@ 
 	 * @return string	Hash code
 	 */
 	public function getHashCode() {
-    	return md5(
-    		  $this->_conditionType
-    		. $this->_operatorType
-    		. implode(';', $this->_condition)
-    		. $this->_style->getHashCode()
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->_conditionType
+			. $this->_operatorType
+			. implode(';', $this->_condition)
+			. $this->_style->getHashCode()
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.

app/Vendor/PHPExcel/PHPExcel/Style/Font.php

Doc Comments +1 added lines, -1 removed lines

@@ -327,7 +327,7 @@
 	/**
 	 * Set Size
 	 *
-	 * @param double $pValue
+	 * @param integer $pValue
 	 * @return PHPExcel_Style_Font
 	 */
 	public function setSize($pValue = 10) {

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
 class PHPExcel_Style_Font implements PHPExcel_IComparable
 {
 	/* Underline types */
-	const UNDERLINE_NONE					= 'none';
+	const UNDERLINE_NONE = 'none';
 	const UNDERLINE_DOUBLE					= 'double';
 	const UNDERLINE_DOUBLEACCOUNTING		= 'doubleAccounting';
 	const UNDERLINE_SINGLE					= 'single';
@@ -47,56 +47,56 @@ 
 	 *
 	 * @var string
 	 */
-	private $_name			= 'Calibri';
+	private $_name = 'Calibri';
 
 	/**
 	 * Font Size
 	 *
 	 * @var float
 	 */
-	private $_size			= 11;
+	private $_size = 11;
 
 	/**
 	 * Bold
 	 *
 	 * @var boolean
 	 */
-	private $_bold			= false;
+	private $_bold = false;
 
 	/**
 	 * Italic
 	 *
 	 * @var boolean
 	 */
-	private $_italic		= false;
+	private $_italic = false;
 
 	/**
 	 * Superscript
 	 *
 	 * @var boolean
 	 */
-	private $_superScript	= false;
+	private $_superScript = false;
 
 	/**
 	 * Subscript
 	 *
 	 * @var boolean
 	 */
-	private $_subScript		= false;
+	private $_subScript = false;
 
 	/**
 	 * Underline
 	 *
 	 * @var string
 	 */
-	private $_underline		= PHPExcel_Style_Font::UNDERLINE_NONE;
+	private $_underline = PHPExcel_Style_Font::UNDERLINE_NONE;
 
 	/**
 	 * Strikethrough
 	 *
 	 * @var boolean
 	 */
-	private $_strikethrough	= false;
+	private $_strikethrough = false;
 
 	/**
 	 * Foreground color
@@ -137,7 +137,7 @@ 
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-		$this->_color				= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		$this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
@@ -432,7 +432,7 @@ 
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
 		} else {
 			$this->_superScript = $pValue;
-			$this->_subScript = !$pValue;
+			$this->_subScript = ! $pValue;
 		}
 		return $this;
 	}
@@ -464,7 +464,7 @@ 
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
 		} else {
 			$this->_subScript = $pValue;
-			$this->_superScript = !$pValue;
+			$this->_superScript = ! $pValue;
 		}
 		return $this;
 	}

Indentation +4 added lines, -4 removed lines

@@ -438,10 +438,10 @@
 	}
 
 		/**
-	 * Get SubScript
-	 *
-	 * @return boolean
-	 */
+		 * Get SubScript
+		 *
+		 * @return boolean
+		 */
 	public function getSubScript() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getSubScript();

app/Vendor/PHPExcel/PHPExcel/Worksheet.php

Doc Comments +12 added lines, -12 removed lines

@@ -550,7 +550,7 @@ 
 	 * Get a chart by its index position
 	 *
 	 * @param	string	$index			Chart index position
-	 * @return	false|PHPExcel_Chart
+	 * @return	null|PHPExcel_Chart
 	 * @throws Exception
 	 */
 	public function getChartByIndex($index = null)
@@ -916,7 +916,7 @@ 
 	/**
 	 * Get sheet view
 	 *
-	 * @return PHPExcel_Worksheet_HeaderFooter
+	 * @return PHPExcel_Worksheet_SheetView
 	 */
 	public function getSheetView()
 	{
@@ -1030,8 +1030,8 @@ 
 	/**
 	 * Set a cell value by using numeric cell coordinates
 	 *
-	 * @param string	$pColumn		Numeric column coordinate of the cell
-	 * @param string	$pRow			Numeric row coordinate of the cell
+	 * @param integer	$pColumn		Numeric column coordinate of the cell
+	 * @param integer	$pRow			Numeric row coordinate of the cell
 	 * @param mixed		$pValue			Value of the cell
 	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
 	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
@@ -1064,11 +1064,11 @@ 
 	/**
 	 * Set a cell value by using numeric cell coordinates
 	 *
-	 * @param string	$pColumn		Numeric column coordinate of the cell
-	 * @param string	$pRow			Numeric row coordinate of the cell
+	 * @param integer	$pColumn		Numeric column coordinate of the cell
+	 * @param integer	$pRow			Numeric row coordinate of the cell
 	 * @param mixed		$pValue			Value of the cell
 	 * @param string	$pDataType		Explicit data type
-	 * @return PHPExcel_Worksheet
+	 * @return PHPExcel_Cell
 	 */
 	public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
 	{
@@ -1148,8 +1148,8 @@ 
 	/**
 	 * Get cell at a specific coordinate by using numeric cell coordinates
 	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @param	string $pRow		Numeric row coordinate of the cell
+	 * @param	integer $pColumn		Numeric column coordinate of the cell
+	 * @param	integer $pRow		Numeric row coordinate of the cell
 	 * @return	PHPExcel_Cell		Cell that was found
 	 */
 	public function getCellByColumnAndRow($pColumn = 0, $pRow = 1)
@@ -1222,8 +1222,8 @@ 
 	/**
 	 * Cell at a specific coordinate by using numeric cell coordinates exists?
 	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @param	string $pRow		Numeric row coordinate of the cell
+	 * @param	integer $pColumn		Numeric column coordinate of the cell
+	 * @param	integer $pRow		Numeric row coordinate of the cell
 	 * @return	boolean
 	 */
 	public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
@@ -1275,7 +1275,7 @@ 
 	/**
 	 * Get column dimension at a specific column by using numeric cell coordinates
 	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
+	 * @param	integer $pColumn		Numeric column coordinate of the cell
 	 * @return	PHPExcel_Worksheet_ColumnDimension
 	 */
 	public function getColumnDimensionByColumn($pColumn = 0)

Spacing +106 added lines, -106 removed lines

@@ -38,11 +38,11 @@ 
 	/* Break types */
 	const BREAK_NONE	= 0;
 	const BREAK_ROW		= 1;
-	const BREAK_COLUMN	= 2;
+	const BREAK_COLUMN = 2;
 
 	/* Sheet state */
-	const SHEETSTATE_VISIBLE	= 'visible';
-	const SHEETSTATE_HIDDEN	= 'hidden';
+	const SHEETSTATE_VISIBLE = 'visible';
+	const SHEETSTATE_HIDDEN = 'hidden';
 	const SHEETSTATE_VERYHIDDEN = 'veryHidden';
 
 	/**
@@ -316,14 +316,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	private $_dirty	= true;
+	private $_dirty = true;
 
 	/**
 	 * Hash
 	 *
 	 * @var string
 	 */
-	private $_hash	= null;
+	private $_hash = null;
 
 	/**
 	 * Create a new worksheet
@@ -338,10 +338,10 @@ 
 		$this->setTitle($pTitle, FALSE);
 		$this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
 
-		$this->_cellCollection		= PHPExcel_CachedObjectStorageFactory::getInstance($this);
+		$this->_cellCollection = PHPExcel_CachedObjectStorageFactory::getInstance($this);
 
 		// Set page setup
-		$this->_pageSetup			= new PHPExcel_Worksheet_PageSetup();
+		$this->_pageSetup = new PHPExcel_Worksheet_PageSetup();
 
 		// Set page margins
 		$this->_pageMargins			= new PHPExcel_Worksheet_PageMargins();
@@ -350,16 +350,16 @@ 
 		$this->_headerFooter		= new PHPExcel_Worksheet_HeaderFooter();
 
 		// Set sheet view
-		$this->_sheetView			= new PHPExcel_Worksheet_SheetView();
+		$this->_sheetView = new PHPExcel_Worksheet_SheetView();
 
 		// Drawing collection
-		$this->_drawingCollection	= new ArrayObject();
+		$this->_drawingCollection = new ArrayObject();
 
     	// Chart collection
-    	$this->_chartCollection 	= new ArrayObject();
+    	$this->_chartCollection = new ArrayObject();
 
 		// Protection
-		$this->_protection			= new PHPExcel_Worksheet_Protection();
+		$this->_protection = new PHPExcel_Worksheet_Protection();
 
 		// Default row dimension
 		$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(null);
@@ -562,7 +562,7 @@ 
 		if (is_null($index)) {
 			$index = --$chartCount;
 		}
-		if (!isset($this->_chartCollection[$index])) {
+		if ( ! isset($this->_chartCollection[$index])) {
 			return false;
 		}
 
@@ -578,7 +578,7 @@ 
 	public function getChartNames()
 	{
 		$chartNames = array();
-		foreach($this->_chartCollection as $chart) {
+		foreach ($this->_chartCollection as $chart) {
 			$chartNames[] = $chart->getName();
 		}
 		return $chartNames;
@@ -597,7 +597,7 @@ 
 		if ($chartCount == 0) {
 			return false;
 		}
-		foreach($this->_chartCollection as $index => $chart) {
+		foreach ($this->_chartCollection as $index => $chart) {
 			if ($chart->getName() == $chartName) {
 				return $this->_chartCollection[$index];
 			}
@@ -651,7 +651,7 @@ 
 	public function calculateWorksheetDimension()
 	{
 		// Return
-		return 'A1' . ':' .  $this->getHighestColumn() . $this->getHighestRow();
+		return 'A1'.':'.$this->getHighestColumn().$this->getHighestRow();
 	}
 
 	/**
@@ -662,7 +662,7 @@ 
 	public function calculateWorksheetDataDimension()
 	{
 		// Return
-		return 'A1' . ':' .  $this->getHighestDataColumn() . $this->getHighestDataRow();
+		return 'A1'.':'.$this->getHighestDataColumn().$this->getHighestDataRow();
 	}
 
 	/**
@@ -682,7 +682,7 @@ 
 		}
 
 		// There is only something to do if there are some auto-size columns
-		if (!empty($autoSizes)) {
+		if ( ! empty($autoSizes)) {
 
 			// build list of cells references that participate in a merge
 			$isMergeCell = array();
@@ -697,7 +697,7 @@ 
 				$cell = $this->getCell($cellID);
 				if (isset($autoSizes[$cell->getColumn()])) {
 					// Determine width if cell does not participate in a merge
-					if (!isset($isMergeCell[$cell->getCoordinate()])) {
+					if ( ! isset($isMergeCell[$cell->getCoordinate()])) {
 						// Calculated value
 						$cellValue = $cell->getCalculatedValue();
 
@@ -705,8 +705,8 @@ 
 						$cellValue = PHPExcel_Style_NumberFormat::toFormattedString($cellValue, $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode());
 
 						$autoSizes[$cell->getColumn()] = max(
-							(float)$autoSizes[$cell->getColumn()],
-							(float)PHPExcel_Shared_Font::calculateColumnWidth(
+							(float) $autoSizes[$cell->getColumn()],
+							(float) PHPExcel_Shared_Font::calculateColumnWidth(
 								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
 								$cellValue,
 								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
@@ -795,24 +795,24 @@ 
 			// Use name, but append with lowest possible integer
 
 			if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
-				$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
+				$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 29);
 			}
 			$i = 1;
-			while ($this->getParent()->getSheetByName($pValue . ' ' . $i)) {
+			while ($this->getParent()->getSheetByName($pValue.' '.$i)) {
 				++$i;
 				if ($i == 10) {
 					if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
-						$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
+						$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 28);
 					}
 				} elseif ($i == 100) {
 					if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
-						$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
+						$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 27);
 					}
 				}
 			}
 
-			$altTitle = $pValue . ' ' . $i;
-			return $this->setTitle($altTitle,$updateFormulaCellReferences);
+			$altTitle = $pValue.' '.$i;
+			return $this->setTitle($altTitle, $updateFormulaCellReferences);
 		}
 
 		// Set title
@@ -1038,7 +1038,7 @@ 
 	 */
 	public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
 	{
-		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValue($pValue);
+		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow)->setValue($pValue);
 
 		if ($returnCell) {
 			return $cell;
@@ -1072,7 +1072,7 @@ 
 	 */
 	public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
 	{
-		return $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValueExplicit($pValue, $pDataType);
+		return $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow)->setValueExplicit($pValue, $pDataType);
 	}
 
 	/**
@@ -1096,7 +1096,7 @@ 
 		}
 
 		// Named range?
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+		if (( ! preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
 			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
 			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
 			if ($namedRange !== NULL) {
@@ -1108,9 +1108,9 @@ 
 		// Uppercase coordinate
 		$pCoordinate = strtoupper($pCoordinate);
 
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
+		if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
 			throw new Exception('Cell coordinate can not be a range of cells.');
-		} elseif (strpos($pCoordinate,'$') !== false) {
+		} elseif (strpos($pCoordinate, '$') !== false) {
 			throw new Exception('Cell coordinate must not be absolute.');
 		} else {
 			// Create new cell object
@@ -1118,22 +1118,22 @@ 
 			// Coordinates
 			$aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
 
-			$cell = $this->_cellCollection->addCacheData($pCoordinate,new PHPExcel_Cell($aCoordinates[0], $aCoordinates[1], null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
+			$cell = $this->_cellCollection->addCacheData($pCoordinate, new PHPExcel_Cell($aCoordinates[0], $aCoordinates[1], null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
 			$this->_cellCollectionIsSorted = false;
 
 			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
 				$this->_cachedHighestColumn = $aCoordinates[0];
 
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$aCoordinates[1]);
+			$this->_cachedHighestRow = max($this->_cachedHighestRow, $aCoordinates[1]);
 
 			// Cell needs appropriate xfIndex
-			$rowDimensions	= $this->getRowDimensions();
+			$rowDimensions = $this->getRowDimensions();
 			$columnDimensions = $this->getColumnDimensions();
 
-			if ( isset($rowDimensions[$aCoordinates[1]]) && $rowDimensions[$aCoordinates[1]]->getXfIndex() !== null ) {
+			if (isset($rowDimensions[$aCoordinates[1]]) && $rowDimensions[$aCoordinates[1]]->getXfIndex() !== null) {
 				// then there is a row dimension with explicit style, assign it to the cell
 				$cell->setXfIndex($rowDimensions[$aCoordinates[1]]->getXfIndex());
-			} else if ( isset($columnDimensions[$aCoordinates[0]]) ) {
+			} else if (isset($columnDimensions[$aCoordinates[0]])) {
 				// then there is a column dimension, assign it to the cell
 				$cell->setXfIndex($columnDimensions[$aCoordinates[0]]->getXfIndex());
 			} else {
@@ -1155,16 +1155,16 @@ 
 	public function getCellByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
 		$columnLetter = PHPExcel_Cell::stringFromColumnIndex($pColumn);
-		$coordinate = $columnLetter . $pRow;
+		$coordinate = $columnLetter.$pRow;
 
-		if (!$this->_cellCollection->isDataSet($coordinate)) {
+		if ( ! $this->_cellCollection->isDataSet($coordinate)) {
 			$cell = $this->_cellCollection->addCacheData($coordinate, new PHPExcel_Cell($columnLetter, $pRow, null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
 			$this->_cellCollectionIsSorted = false;
 
 			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < $pColumn)
 				$this->_cachedHighestColumn = $columnLetter;
 
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
+			$this->_cachedHighestRow = max($this->_cachedHighestRow, $pRow);
 
 			return $cell;
 		}
@@ -1188,16 +1188,16 @@ 
 		}
 
 		// Named range?
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+		if (( ! preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
 			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
 			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
 			if ($namedRange !== NULL) {
 				$pCoordinate = $namedRange->getRange();
 				if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
-					if (!$namedRange->getLocalOnly()) {
+					if ( ! $namedRange->getLocalOnly()) {
 						return $namedRange->getWorksheet()->cellExists($pCoordinate);
 					} else {
-						throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
+						throw new Exception('Named range '.$namedRange->getName().' is not accessible from within sheet '.$this->getTitle());
 					}
 				}
 			}
@@ -1206,9 +1206,9 @@ 
 		// Uppercase coordinate
 		$pCoordinate = strtoupper($pCoordinate);
 
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
+		if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
 			throw new Exception('Cell coordinate can not be a range of cells.');
-		} elseif (strpos($pCoordinate,'$') !== false) {
+		} elseif (strpos($pCoordinate, '$') !== false) {
 			throw new Exception('Cell coordinate must not be absolute.');
 		} else {
 			// Coordinates
@@ -1228,7 +1228,7 @@ 
 	 */
 	public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
-		return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+		return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow);
 	}
 
 	/**
@@ -1243,10 +1243,10 @@ 
 		$found = null;
 
 		// Get row dimension
-		if (!isset($this->_rowDimensions[$pRow])) {
+		if ( ! isset($this->_rowDimensions[$pRow])) {
 			$this->_rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
 
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
+			$this->_cachedHighestRow = max($this->_cachedHighestRow, $pRow);
 		}
 		return $this->_rowDimensions[$pRow];
 	}
@@ -1263,7 +1263,7 @@ 
 		$pColumn = strtoupper($pColumn);
 
 		// Fetch dimensions
-		if (!isset($this->_columnDimensions[$pColumn])) {
+		if ( ! isset($this->_columnDimensions[$pColumn])) {
 			$this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
 
 			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
@@ -1350,7 +1350,7 @@ 
 	 */
 	public function getConditionalStyles($pCoordinate = 'A1')
 	{
-		if (!isset($this->_conditionalStylesCollection[$pCoordinate])) {
+		if ( ! isset($this->_conditionalStylesCollection[$pCoordinate])) {
 			$this->_conditionalStylesCollection[$pCoordinate] = array();
 		}
 		return $this->_conditionalStylesCollection[$pCoordinate];
@@ -1414,7 +1414,7 @@ 
 	 */
 	public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
-		return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+		return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow);
 	}
 
 	/**
@@ -1475,11 +1475,11 @@ 
 
 		// Calculate range outer borders
 		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
+		$rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
 
 		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+		$rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
+		$rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
 
 		// Make sure we can loop upwards on rows and columns
 		if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1491,7 +1491,7 @@ 
 		// Loop through cells and apply styles
 		for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
 			for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-				$this->getCell(PHPExcel_Cell::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
+				$this->getCell(PHPExcel_Cell::stringFromColumnIndex($col).$row)->setXfIndex($xfIndex);
 			}
 		}
 
@@ -1510,8 +1510,8 @@ 
 	 */
 	public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
 	{
-		foreach($pCellStyle as $cellStyle) {
-			if (!is_a($cellStyle,'PHPExcel_Style_Conditional')) {
+		foreach ($pCellStyle as $cellStyle) {
+			if ( ! is_a($cellStyle, 'PHPExcel_Style_Conditional')) {
 				throw new Exception('Style is not a conditional style');
 			}
 		}
@@ -1531,11 +1531,11 @@ 
 
 		// Calculate range outer borders
 		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
+		$rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
 
 		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+		$rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
+		$rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
 
 		// Make sure we can loop upwards on rows and columns
 		if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1547,7 +1547,7 @@ 
 		// Loop through cells and apply styles
 		for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
 			for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-				$this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col) . $row, $pCellStyle);
+				$this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col).$row, $pCellStyle);
 			}
 		}
 
@@ -1607,7 +1607,7 @@ 
 	 */
 	public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = PHPExcel_Worksheet::BREAK_NONE)
 	{
-		return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
+		return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow, $pBreak);
 	}
 
 	/**
@@ -1632,7 +1632,7 @@ 
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
-		if (strpos($pRange,':') !== false) {
+		if (strpos($pRange, ':') !== false) {
 			$this->_mergeCells[$pRange] = $pRange;
 
 			// make sure cells are created
@@ -1642,7 +1642,7 @@ 
 
 			// create upper left cell if it does not already exist
 			$upperLeft = $aReferences[0];
-			if (!$this->cellExists($upperLeft)) {
+			if ( ! $this->cellExists($upperLeft)) {
 				$this->getCell($upperLeft)->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
 			}
 
@@ -1671,7 +1671,7 @@ 
 	 */
 	public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
 	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1).$pRow1.':'.PHPExcel_Cell::stringFromColumnIndex($pColumn2).$pRow2;
 		return $this->mergeCells($cellRange);
 	}
 
@@ -1687,11 +1687,11 @@ 
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
-		if (strpos($pRange,':') !== false) {
+		if (strpos($pRange, ':') !== false) {
 			if (isset($this->_mergeCells[$pRange])) {
 				unset($this->_mergeCells[$pRange]);
 			} else {
-				throw new Exception('Cell range ' . $pRange . ' not known as merged.');
+				throw new Exception('Cell range '.$pRange.' not known as merged.');
 			}
 		} else {
 			throw new Exception('Merge can only be removed from a range of cells.');
@@ -1712,7 +1712,7 @@ 
 	 */
 	public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
 	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1).$pRow1.':'.PHPExcel_Cell::stringFromColumnIndex($pColumn2).$pRow2;
 		return $this->unmergeCells($cellRange);
 	}
 
@@ -1753,7 +1753,7 @@ 
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
-		if (!$pAlreadyHashed) {
+		if ( ! $pAlreadyHashed) {
 			$pPassword = PHPExcel_Shared_PasswordHasher::hashPassword($pPassword);
 		}
 		$this->_protectedCells[$pRange] = $pPassword;
@@ -1775,7 +1775,7 @@ 
 	 */
 	public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
 	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1).$pRow1.':'.PHPExcel_Cell::stringFromColumnIndex($pColumn2).$pRow2;
 		return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed);
 	}
 
@@ -1794,7 +1794,7 @@ 
 		if (isset($this->_protectedCells[$pRange])) {
 			unset($this->_protectedCells[$pRange]);
 		} else {
-			throw new Exception('Cell range ' . $pRange . ' not known as protected.');
+			throw new Exception('Cell range '.$pRange.' not known as protected.');
 		}
 		return $this;
 	}
@@ -1813,7 +1813,7 @@ 
 	 */
 	public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
 	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1).$pRow1.':'.PHPExcel_Cell::stringFromColumnIndex($pColumn2).$pRow2;
 		return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
 	}
 
@@ -1849,7 +1849,7 @@ 
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
-		if (strpos($pRange,':') !== false) {
+		if (strpos($pRange, ':') !== false) {
 			$this->_autoFilter = $pRange;
 			$this->_dirty = true;
 		} else {
@@ -1871,9 +1871,9 @@ 
 	public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
 	{
 		return $this->setAutoFilter(
-			PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1
-			. ':' .
-			PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2
+			PHPExcel_Cell::stringFromColumnIndex($pColumn1).$pRow1
+			. ':'.
+			PHPExcel_Cell::stringFromColumnIndex($pColumn2).$pRow2
 		);
 	}
 
@@ -1910,7 +1910,7 @@ 
 		// Uppercase coordinate
 		$pCell = strtoupper($pCell);
 
-		if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
+		if (strpos($pCell, ':') === false && strpos($pCell, ',') === false) {
 			$this->_freezePane = $pCell;
 		} else {
 			throw new Exception('Freeze pane can not be set on a range of cells.');
@@ -1928,7 +1928,7 @@ 
 	 */
 	public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
-		return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+		return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow);
 	}
 
 	/**
@@ -1952,7 +1952,7 @@ 
 	public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
 		if ($pBefore >= 1) {
 			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
+			$objReferenceHelper->insertNewBefore('A'.$pBefore, 0, $pNumRows, $this);
 		} else {
 			throw new Exception("Rows can only be inserted before at least row 1.");
 		}
@@ -1968,9 +1968,9 @@ 
 	 * @return PHPExcel_Worksheet
 	 */
 	public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
-		if (!is_numeric($pBefore)) {
+		if ( ! is_numeric($pBefore)) {
 			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
+			$objReferenceHelper->insertNewBefore($pBefore.'1', $pNumCols, 0, $this);
 		} else {
 			throw new Exception("Column references should not be numeric.");
 		}
@@ -2004,7 +2004,7 @@ 
 	public function removeRow($pRow = 1, $pNumRows = 1) {
 		if ($pRow >= 1) {
 			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
+			$objReferenceHelper->insertNewBefore('A'.($pRow + $pNumRows), 0, -$pNumRows, $this);
 		} else {
 			throw new Exception("Rows to be deleted should at least start from row 1.");
 		}
@@ -2020,10 +2020,10 @@ 
 	 * @return PHPExcel_Worksheet
 	 */
 	public function removeColumn($pColumn = 'A', $pNumCols = 1) {
-		if (!is_numeric($pColumn)) {
+		if ( ! is_numeric($pColumn)) {
 			$pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
 			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
+			$objReferenceHelper->insertNewBefore($pColumn.'1', -$pNumCols, 0, $this);
 		} else {
 			throw new Exception("Column references should not be numeric.");
 		}
@@ -2181,9 +2181,9 @@ 
 		// Uppercase coordinate
 		$pCellCoordinate = strtoupper($pCellCoordinate);
 
-		if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
+		if (strpos($pCellCoordinate, ':') !== false || strpos($pCellCoordinate, ',') !== false) {
 			throw new Exception('Cell coordinate string can not be a range of cells.');
-		} else if (strpos($pCellCoordinate,'$') !== false) {
+		} else if (strpos($pCellCoordinate, '$') !== false) {
 			throw new Exception('Cell coordinate string must not be absolute.');
 		} else if ($pCellCoordinate == '') {
 			throw new Exception('Cell coordinate can not be zero-length string.');
@@ -2209,7 +2209,7 @@ 
 	 */
 	public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
-		return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+		return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow);
 	}
 
 	/**
@@ -2278,8 +2278,8 @@ 
 		// Convert '1:3' to 'A1:XFD3'
 		$pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
 
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-			list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
+		if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
+			list($first,) = PHPExcel_Cell::splitRange($pCoordinate);
 			$this->_activeCell = $first[0];
 		} else {
 			$this->_activeCell = $pCoordinate;
@@ -2298,7 +2298,7 @@ 
 	 */
 	public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
 	{
-		return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+		return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn).$pRow);
 	}
 
 	/**
@@ -2334,7 +2334,7 @@ 
 	public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
 		if (is_array($source)) {
 			//	Convert a 1-D array to 2-D (for ease of looping)
-			if (!is_array(end($source))) {
+			if ( ! is_array(end($source))) {
 				$source = array($source);
 			}
 
@@ -2344,16 +2344,16 @@ 
 			// Loop through $source
 			foreach ($source as $rowData) {
 				$currentColumn = $startColumn;
-				foreach($rowData as $cellValue) {
+				foreach ($rowData as $cellValue) {
 					if ($strictNullComparison) {
 						if ($cellValue !== $nullValue) {
 							// Set cell value
-							$this->getCell($currentColumn . $startRow)->setValue($cellValue);
+							$this->getCell($currentColumn.$startRow)->setValue($cellValue);
 						}
 					} else {
 						if ($cellValue != $nullValue) {
 							// Set cell value
-							$this->getCell($currentColumn . $startRow)->setValue($cellValue);
+							$this->getCell($currentColumn.$startRow)->setValue($cellValue);
 						}
 					}
 					++$currentColumn;
@@ -2383,9 +2383,9 @@ 
 
 		//	Identify the range that we need to extract from the worksheet
 		list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
-		$minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
+		$minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] - 1);
 		$minRow = $rangeStart[1];
-		$maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] -1);
+		$maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - 1);
 		$maxRow = $rangeEnd[1];
 
 		$maxCol++;
@@ -2452,7 +2452,7 @@ 
 			$pWorkSheet = $namedRange->getWorksheet();
 			$pCellRange = $namedRange->getRange();
 
-			return $pWorkSheet->rangeToArray(	$pCellRange,
+			return $pWorkSheet->rangeToArray($pCellRange,
 												$nullValue, $calculateFormulas, $formatData, $returnCellRef);
 		}
 
@@ -2478,7 +2478,7 @@ 
 		$maxCol = $this->getHighestColumn();
 		$maxRow = $this->getHighestRow();
 		// Return
-		return $this->rangeToArray(	'A1:'.$maxCol.$maxRow,
+		return $this->rangeToArray('A1:'.$maxCol.$maxRow,
 									$nullValue, $calculateFormulas, $formatData, $returnCellRef);
 	}
 
@@ -2489,7 +2489,7 @@ 
 	 * @return PHPExcel_Worksheet_RowIterator
 	 */
 	public function getRowIterator($startRow = 1) {
-		return new PHPExcel_Worksheet_RowIterator($this,$startRow);
+		return new PHPExcel_Worksheet_RowIterator($this, $startRow);
 	}
 
 	/**
@@ -2514,12 +2514,12 @@ 
 
 		// Loop through column dimensions
 		foreach ($this->_columnDimensions as $dimension) {
-			$highestColumn = max($highestColumn,PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
+			$highestColumn = max($highestColumn, PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
 		}
 
 		// Loop through row dimensions
 		foreach ($this->_rowDimensions as $dimension) {
-			$highestRow = max($highestRow,$dimension->getRowIndex());
+			$highestRow = max($highestRow, $dimension->getRowIndex());
 		}
 
 		// Cache values
@@ -2541,9 +2541,9 @@ 
 	 */
 	public function getHashCode() {
 		if ($this->_dirty) {
-			$this->_hash = md5( $this->_title .
-								$this->_autoFilter .
-								($this->_protection->isProtectionEnabled() ? 't' : 'f') .
+			$this->_hash = md5($this->_title.
+								$this->_autoFilter.
+								($this->_protection->isProtectionEnabled() ? 't' : 'f').
 								__CLASS__
 							  );
 			$this->_dirty = false;
@@ -2568,7 +2568,7 @@ 
 		}
 
 		if ($returnRange) {
-			return array( trim(substr($pRange, 0, $sep),"'"),
+			return array(trim(substr($pRange, 0, $sep), "'"),
 						  substr($pRange, $sep + 1)
 						);
 		}
@@ -2697,7 +2697,7 @@ 
 		$maxRow = $this->getHighestRow();
 		$maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
 
-		$rangeBlocks = explode(' ',$range);
+		$rangeBlocks = explode(' ', $range);
 		foreach ($rangeBlocks as &$rangeSet) {
 			$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
 
@@ -2708,7 +2708,7 @@ 
 			$rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
 		}
 		unset($rangeSet);
-		$stRange = implode(' ',$rangeBlocks);
+		$stRange = implode(' ', $rangeBlocks);
 
 		return $stRange;
 	}

Braces +18 added lines, -11 removed lines

@@ -719,7 +719,9 @@ 
 
 			// adjust column widths
 			foreach ($autoSizes as $columnIndex => $width) {
-				if ($width == -1) $width = $this->getDefaultColumnDimension()->getWidth();
+				if ($width == -1) {
+					$width = $this->getDefaultColumnDimension()->getWidth();
+				}
 				$this->getColumnDimension($columnIndex)->setWidth($width);
 			}
 		}
@@ -821,8 +823,9 @@ 
 
 		// New title
 		$newTitle = $this->getTitle();
-		if ($updateFormulaCellReferences)
-			PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->getParent(), $oldTitle, $newTitle);
+		if ($updateFormulaCellReferences) {
+					PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->getParent(), $oldTitle, $newTitle);
+		}
 
 		return $this;
 	}
@@ -1121,8 +1124,9 @@ 
 			$cell = $this->_cellCollection->addCacheData($pCoordinate,new PHPExcel_Cell($aCoordinates[0], $aCoordinates[1], null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
 			$this->_cellCollectionIsSorted = false;
 
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
-				$this->_cachedHighestColumn = $aCoordinates[0];
+			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0])) {
+							$this->_cachedHighestColumn = $aCoordinates[0];
+			}
 
 			$this->_cachedHighestRow = max($this->_cachedHighestRow,$aCoordinates[1]);
 
@@ -1161,8 +1165,9 @@ 
 			$cell = $this->_cellCollection->addCacheData($coordinate, new PHPExcel_Cell($columnLetter, $pRow, null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
 			$this->_cellCollectionIsSorted = false;
 
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < $pColumn)
-				$this->_cachedHighestColumn = $columnLetter;
+			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < $pColumn) {
+							$this->_cachedHighestColumn = $columnLetter;
+			}
 
 			$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
 
@@ -1266,8 +1271,9 @@ 
 		if (!isset($this->_columnDimensions[$pColumn])) {
 			$this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
 
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
-				$this->_cachedHighestColumn = $pColumn;
+			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn)) {
+							$this->_cachedHighestColumn = $pColumn;
+			}
 		}
 		return $this->_columnDimensions[$pColumn];
 	}
@@ -2721,8 +2727,9 @@ 
 	 */
 	public function getTabColor()
 	{
-		if ($this->_tabColor === NULL)
-			$this->_tabColor = new PHPExcel_Style_Color();
+		if ($this->_tabColor === NULL) {
+					$this->_tabColor = new PHPExcel_Style_Color();
+		}
 
 		return $this->_tabColor;
 	}

Indentation +39 added lines, -39 removed lines

@@ -221,17 +221,17 @@ 
 	private $_showGridlines = true;
 
 	/**
-	* Print gridlines?
-	*
-	* @var boolean
-	*/
+	 * Print gridlines?
+	 *
+	 * @var boolean
+	 */
 	private $_printGridlines = false;
 
 	/**
-	* Show row and column headers?
-	*
-	* @var boolean
-	*/
+	 * Show row and column headers?
+	 *
+	 * @var boolean
+	 */
 	private $_showRowColHeaders = true;
 
 	/**
@@ -355,8 +355,8 @@ 
 		// Drawing collection
 		$this->_drawingCollection	= new ArrayObject();
 
-    	// Chart collection
-    	$this->_chartCollection 	= new ArrayObject();
+		// Chart collection
+		$this->_chartCollection 	= new ArrayObject();
 
 		// Protection
 		$this->_protection			= new PHPExcel_Worksheet_Protection();
@@ -1877,16 +1877,16 @@ 
 		);
 	}
 
-    /**
-     * Remove autofilter
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function removeAutoFilter()
-    {
-    	$this->_autoFilter = '';
-    	return $this;
-    }
+	/**
+	 * Remove autofilter
+	 *
+	 * @return PHPExcel_Worksheet
+	 */
+	public function removeAutoFilter()
+	{
+		$this->_autoFilter = '';
+		return $this;
+	}
 
 	/**
 	 * Get Freeze Pane
@@ -2067,40 +2067,40 @@ 
 	}
 
 	/**
-	* Print gridlines?
-	*
-	* @return boolean
-	*/
+	 * Print gridlines?
+	 *
+	 * @return boolean
+	 */
 	public function getPrintGridlines() {
 		return $this->_printGridlines;
 	}
 
 	/**
-	* Set print gridlines
-	*
-	* @param boolean $pValue Print gridlines (true/false)
-	* @return PHPExcel_Worksheet
-	*/
+	 * Set print gridlines
+	 *
+	 * @param boolean $pValue Print gridlines (true/false)
+	 * @return PHPExcel_Worksheet
+	 */
 	public function setPrintGridlines($pValue = false) {
 		$this->_printGridlines = $pValue;
 		return $this;
 	}
 
 	/**
-	* Show row and column headers?
-	*
-	* @return boolean
-	*/
+	 * Show row and column headers?
+	 *
+	 * @return boolean
+	 */
 	public function getShowRowColHeaders() {
 		return $this->_showRowColHeaders;
 	}
 
 	/**
-	* Set show row and column headers
-	*
-	* @param boolean $pValue Show row and column headers (true/false)
-	* @return PHPExcel_Worksheet
-	*/
+	 * Set show row and column headers
+	 *
+	 * @param boolean $pValue Show row and column headers (true/false)
+	 * @return PHPExcel_Worksheet
+	 */
 	public function setShowRowColHeaders($pValue = false) {
 		$this->_showRowColHeaders = $pValue;
 		return $this;
@@ -2485,7 +2485,7 @@ 
 	/**
 	 * Get row iterator
 	 *
-     * @param  integer                           $startRow    The row number at which to start iterating
+	 * @param  integer                           $startRow    The row number at which to start iterating
 	 * @return PHPExcel_Worksheet_RowIterator
 	 */
 	public function getRowIterator($startRow = 1) {

app/Vendor/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php

Doc Comments +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
     /**
      * Get ColumnIndex
      *
-     * @return string
+     * @return integer
      */
     public function getColumnIndex() {
     	return $this->_columnIndex;
@@ -132,7 +132,7 @@ 
     /**
      * Set Width
      *
-     * @param double $pValue
+     * @param integer $pValue
      * @return PHPExcel_Worksheet_ColumnDimension
      */
     public function setWidth($pValue = -1) {

Spacing +6 added lines, -6 removed lines

@@ -49,35 +49,35 @@ 
 	 *
 	 * @var double
 	 */
-	private $_width			= -1;
+	private $_width = -1;
 
 	/**
 	 * Auto size?
 	 *
 	 * @var bool
 	 */
-	private $_autoSize		= false;
+	private $_autoSize = false;
 
 	/**
 	 * Visible?
 	 *
 	 * @var bool
 	 */
-	private $_visible		= true;
+	private $_visible = true;
 
 	/**
 	 * Outline level
 	 *
 	 * @var int
 	 */
-	private $_outlineLevel	= 0;
+	private $_outlineLevel = 0;
 
 	/**
 	 * Collapsed
 	 *
 	 * @var bool
 	 */
-	private $_collapsed		= false;
+	private $_collapsed = false;
 
 	/**
 	 * Index to cellXf
@@ -94,7 +94,7 @@ 
     public function __construct($pIndex = 'A')
     {
     	// Initialise values
-    	$this->_columnIndex		= $pIndex;
+    	$this->_columnIndex = $pIndex;
 
 		// set default index to cellXf
 		$this->_xfIndex = 0;

Indentation +124 added lines, -124 removed lines

@@ -86,146 +86,146 @@
 	 */
 	private $_xfIndex;
 
-    /**
-     * Create a new PHPExcel_Worksheet_ColumnDimension
-     *
-     * @param string $pIndex Character column index
-     */
-    public function __construct($pIndex = 'A')
-    {
-    	// Initialise values
-    	$this->_columnIndex		= $pIndex;
+	/**
+	 * Create a new PHPExcel_Worksheet_ColumnDimension
+	 *
+	 * @param string $pIndex Character column index
+	 */
+	public function __construct($pIndex = 'A')
+	{
+		// Initialise values
+		$this->_columnIndex		= $pIndex;
 
 		// set default index to cellXf
 		$this->_xfIndex = 0;
-    }
+	}
 
-    /**
-     * Get ColumnIndex
-     *
-     * @return string
-     */
-    public function getColumnIndex() {
-    	return $this->_columnIndex;
-    }
+	/**
+	 * Get ColumnIndex
+	 *
+	 * @return string
+	 */
+	public function getColumnIndex() {
+		return $this->_columnIndex;
+	}
 
-    /**
-     * Set ColumnIndex
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setColumnIndex($pValue) {
-    	$this->_columnIndex = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set ColumnIndex
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setColumnIndex($pValue) {
+		$this->_columnIndex = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Width
-     *
-     * @return double
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
+	/**
+	 * Get Width
+	 *
+	 * @return double
+	 */
+	public function getWidth() {
+		return $this->_width;
+	}
 
-    /**
-     * Set Width
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setWidth($pValue = -1) {
-    	$this->_width = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Width
+	 *
+	 * @param double $pValue
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setWidth($pValue = -1) {
+		$this->_width = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Auto Size
-     *
-     * @return bool
-     */
-    public function getAutoSize() {
-    	return $this->_autoSize;
-    }
+	/**
+	 * Get Auto Size
+	 *
+	 * @return bool
+	 */
+	public function getAutoSize() {
+		return $this->_autoSize;
+	}
 
-    /**
-     * Set Auto Size
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setAutoSize($pValue = false) {
-    	$this->_autoSize = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Auto Size
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setAutoSize($pValue = false) {
+		$this->_autoSize = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
+	/**
+	 * Get Visible
+	 *
+	 * @return bool
+	 */
+	public function getVisible() {
+		return $this->_visible;
+	}
 
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Visible
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setVisible($pValue = true) {
+		$this->_visible = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
+	/**
+	 * Get Outline Level
+	 *
+	 * @return int
+	 */
+	public function getOutlineLevel() {
+		return $this->_outlineLevel;
+	}
 
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws Exception
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new Exception("Outline level must range between 0 and 7.");
-    	}
+	/**
+	 * Set Outline Level
+	 *
+	 * Value must be between 0 and 7
+	 *
+	 * @param int $pValue
+	 * @throws Exception
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setOutlineLevel($pValue) {
+		if ($pValue < 0 || $pValue > 7) {
+			throw new Exception("Outline level must range between 0 and 7.");
+		}
 
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
+		$this->_outlineLevel = $pValue;
+		return $this;
+	}
 
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
+	/**
+	 * Get Collapsed
+	 *
+	 * @return bool
+	 */
+	public function getCollapsed() {
+		return $this->_collapsed;
+	}
 
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
+	/**
+	 * Set Collapsed
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_ColumnDimension
+	 */
+	public function setCollapsed($pValue = true) {
+		$this->_collapsed = $pValue;
+		return $this;
+	}
 
 	/**
 	 * Get index to cellXf

app/Vendor/PHPExcel/PHPExcel/Worksheet/PageSetup.php

Doc Comments +2 added lines, -2 removed lines

@@ -766,7 +766,7 @@ 
      * Set first page number
      *
      * @param int $value
-     * @return PHPExcel_Worksheet_HeaderFooter
+     * @return PHPExcel_Worksheet_PageSetup
      */
     public function setFirstPageNumber($value = null) {
 		$this->_firstPageNumber = $value;
@@ -776,7 +776,7 @@ 
     /**
      * Reset first page number
      *
-     * @return PHPExcel_Worksheet_HeaderFooter
+     * @return PHPExcel_Worksheet_PageSetup
      */
     public function resetFirstPageNumber() {
 		return $this->setFirstPageNumber(null);

Spacing +58 added lines, -58 removed lines

@@ -108,24 +108,24 @@ 
 {
 	/* Paper size */
 	const PAPERSIZE_LETTER							= 1;
-	const PAPERSIZE_LETTER_SMALL					= 2;
-	const PAPERSIZE_TABLOID							= 3;
+	const PAPERSIZE_LETTER_SMALL = 2;
+	const PAPERSIZE_TABLOID = 3;
 	const PAPERSIZE_LEDGER							= 4;
-	const PAPERSIZE_LEGAL							= 5;
+	const PAPERSIZE_LEGAL = 5;
 	const PAPERSIZE_STATEMENT						= 6;
 	const PAPERSIZE_EXECUTIVE						= 7;
 	const PAPERSIZE_A3								= 8;
 	const PAPERSIZE_A4								= 9;
-	const PAPERSIZE_A4_SMALL						= 10;
+	const PAPERSIZE_A4_SMALL = 10;
 	const PAPERSIZE_A5								= 11;
 	const PAPERSIZE_B4								= 12;
 	const PAPERSIZE_B5								= 13;
-	const PAPERSIZE_FOLIO							= 14;
-	const PAPERSIZE_QUARTO							= 15;
+	const PAPERSIZE_FOLIO = 14;
+	const PAPERSIZE_QUARTO = 15;
 	const PAPERSIZE_STANDARD_1						= 16;
 	const PAPERSIZE_STANDARD_2						= 17;
-	const PAPERSIZE_NOTE							= 18;
-	const PAPERSIZE_NO9_ENVELOPE					= 19;
+	const PAPERSIZE_NOTE = 18;
+	const PAPERSIZE_NO9_ENVELOPE = 19;
 	const PAPERSIZE_NO10_ENVELOPE					= 20;
 	const PAPERSIZE_NO11_ENVELOPE					= 21;
 	const PAPERSIZE_NO12_ENVELOPE					= 22;
@@ -143,45 +143,45 @@ 
 	const PAPERSIZE_B5_ENVELOPE						= 34;
 	const PAPERSIZE_B6_ENVELOPE						= 35;
 	const PAPERSIZE_ITALY_ENVELOPE					= 36;
-	const PAPERSIZE_MONARCH_ENVELOPE				= 37;
+	const PAPERSIZE_MONARCH_ENVELOPE = 37;
 	const PAPERSIZE_6_3_4_ENVELOPE					= 38;
 	const PAPERSIZE_US_STANDARD_FANFOLD				= 39;
 	const PAPERSIZE_GERMAN_STANDARD_FANFOLD			= 40;
 	const PAPERSIZE_GERMAN_LEGAL_FANFOLD			= 41;
-	const PAPERSIZE_ISO_B4							= 42;
+	const PAPERSIZE_ISO_B4 = 42;
 	const PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		= 43;
 	const PAPERSIZE_STANDARD_PAPER_1				= 44;
 	const PAPERSIZE_STANDARD_PAPER_2				= 45;
 	const PAPERSIZE_STANDARD_PAPER_3				= 46;
 	const PAPERSIZE_INVITE_ENVELOPE					= 47;
-	const PAPERSIZE_LETTER_EXTRA_PAPER				= 48;
-	const PAPERSIZE_LEGAL_EXTRA_PAPER				= 49;
+	const PAPERSIZE_LETTER_EXTRA_PAPER = 48;
+	const PAPERSIZE_LEGAL_EXTRA_PAPER = 49;
 	const PAPERSIZE_TABLOID_EXTRA_PAPER				= 50;
-	const PAPERSIZE_A4_EXTRA_PAPER					= 51;
-	const PAPERSIZE_LETTER_TRANSVERSE_PAPER			= 52;
+	const PAPERSIZE_A4_EXTRA_PAPER = 51;
+	const PAPERSIZE_LETTER_TRANSVERSE_PAPER = 52;
 	const PAPERSIZE_A4_TRANSVERSE_PAPER				= 53;
-	const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	= 54;
+	const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER = 54;
 	const PAPERSIZE_SUPERA_SUPERA_A4_PAPER			= 55;
 	const PAPERSIZE_SUPERB_SUPERB_A3_PAPER			= 56;
-	const PAPERSIZE_LETTER_PLUS_PAPER				= 57;
-	const PAPERSIZE_A4_PLUS_PAPER					= 58;
-	const PAPERSIZE_A5_TRANSVERSE_PAPER				= 59;
-	const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			= 60;
+	const PAPERSIZE_LETTER_PLUS_PAPER = 57;
+	const PAPERSIZE_A4_PLUS_PAPER = 58;
+	const PAPERSIZE_A5_TRANSVERSE_PAPER = 59;
+	const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER = 60;
 	const PAPERSIZE_A3_EXTRA_PAPER					= 61;
 	const PAPERSIZE_A5_EXTRA_PAPER					= 62;
-	const PAPERSIZE_ISO_B5_EXTRA_PAPER				= 63;
-	const PAPERSIZE_A2_PAPER						= 64;
-	const PAPERSIZE_A3_TRANSVERSE_PAPER				= 65;
-	const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		= 66;
+	const PAPERSIZE_ISO_B5_EXTRA_PAPER = 63;
+	const PAPERSIZE_A2_PAPER = 64;
+	const PAPERSIZE_A3_TRANSVERSE_PAPER = 65;
+	const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER = 66;
 
 	/* Page orientation */
-	const ORIENTATION_DEFAULT	= 'default';
-	const ORIENTATION_LANDSCAPE	= 'landscape';
-	const ORIENTATION_PORTRAIT	= 'portrait';
+	const ORIENTATION_DEFAULT = 'default';
+	const ORIENTATION_LANDSCAPE = 'landscape';
+	const ORIENTATION_PORTRAIT = 'portrait';
 
 	/* Print Range Set Method */
-	const SETPRINTRANGE_OVERWRITE	= 'O';
-	const SETPRINTRANGE_INSERT		= 'I';
+	const SETPRINTRANGE_OVERWRITE = 'O';
+	const SETPRINTRANGE_INSERT = 'I';
 
 
 	/**
@@ -189,14 +189,14 @@ 
 	 *
 	 * @var int
 	 */
-	private $_paperSize		= PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
+	private $_paperSize = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
 
 	/**
 	 * Orientation
 	 *
 	 * @var string
 	 */
-	private $_orientation	= PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
+	private $_orientation = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
 
 	/**
 	 * Scale (Print Scale)
@@ -206,7 +206,7 @@ 
 	 *
 	 * @var int?
 	 */
-	private $_scale			= 100;
+	private $_scale = 100;
 
 	/**
 	  * Fit To Page
@@ -214,7 +214,7 @@ 
 	  *
 	  * @var boolean
 	  */
-	private $_fitToPage		= FALSE;
+	private $_fitToPage = FALSE;
 
 	/**
 	  * Fit To Height
@@ -222,7 +222,7 @@ 
 	  *
 	  * @var int?
 	  */
-	private $_fitToHeight	= 1;
+	private $_fitToHeight = 1;
 
 	/**
 	  * Fit To Width
@@ -230,7 +230,7 @@ 
 	  *
 	  * @var int?
 	  */
-	private $_fitToWidth	= 1;
+	private $_fitToWidth = 1;
 
 	/**
 	 * Columns to repeat at left
@@ -575,9 +575,9 @@ 
 		if ($index == 0) {
 			return $this->_printArea;
 		}
-		$printAreas = explode(',',$this->_printArea);
-		if (isset($printAreas[$index-1])) {
-			return $printAreas[$index-1];
+		$printAreas = explode(',', $this->_printArea);
+		if (isset($printAreas[$index - 1])) {
+			return $printAreas[$index - 1];
 		}
 		throw new Exception("Requested Print Area does not exist");
 	}
@@ -593,10 +593,10 @@ 
 	 */
 	public function isPrintAreaSet($index = 0) {
 		if ($index == 0) {
-			return !is_null($this->_printArea);
+			return ! is_null($this->_printArea);
 		}
-		$printAreas = explode(',',$this->_printArea);
-		return isset($printAreas[$index-1]);
+		$printAreas = explode(',', $this->_printArea);
+		return isset($printAreas[$index - 1]);
 	}
 
 	/**
@@ -612,10 +612,10 @@ 
 		if ($index == 0) {
 			$this->_printArea = NULL;
 		} else {
-			$printAreas = explode(',',$this->_printArea);
-			if (isset($printAreas[$index-1])) {
-				unset($printAreas[$index-1]);
-				$this->_printArea = implode(',',$printAreas);
+			$printAreas = explode(',', $this->_printArea);
+			if (isset($printAreas[$index - 1])) {
+				unset($printAreas[$index - 1]);
+				$this->_printArea = implode(',', $printAreas);
 			}
 		}
 
@@ -643,11 +643,11 @@ 
 	 * @throws	Exception
 	 */
 	public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) {
-		if (strpos($value,'!') !== false) {
+		if (strpos($value, '!') !== false) {
 			throw new Exception('Cell coordinate must not specify a worksheet.');
-		} elseif (strpos($value,':') === false) {
+		} elseif (strpos($value, ':') === false) {
 			throw new Exception('Cell coordinate must be a range of cells.');
-		} elseif (strpos($value,'$') !== false) {
+		} elseif (strpos($value, '$') !== false) {
 			throw new Exception('Cell coordinate must not be absolute.');
 		}
 		$value = strtoupper($value);
@@ -656,29 +656,29 @@ 
 			if ($index == 0) {
 				$this->_printArea = $value;
 			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
+				$printAreas = explode(',', $this->_printArea);
+				if ($index < 0) {
 					$index = count($printAreas) - abs($index) + 1;
 				}
 				if (($index <= 0) || ($index > count($printAreas))) {
 		    		throw new Exception('Invalid index for setting print range.');
 				}
-				$printAreas[$index-1] = $value;
-				$this->_printArea = implode(',',$printAreas);
+				$printAreas[$index - 1] = $value;
+				$this->_printArea = implode(',', $printAreas);
 			}
-		} elseif($method == self::SETPRINTRANGE_INSERT) {
+		} elseif ($method == self::SETPRINTRANGE_INSERT) {
 			if ($index == 0) {
 				$this->_printArea .= ($this->_printArea == '') ? $value : ','.$value;
 			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
+				$printAreas = explode(',', $this->_printArea);
+				if ($index < 0) {
 					$index = abs($index) - 1;
 				}
 				if ($index > count($printAreas)) {
 		    		throw new Exception('Invalid index for setting print range.');
 				}
-				$printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index));
-				$this->_printArea = implode(',',$printAreas);
+				$printAreas = array_merge(array_slice($printAreas, 0, $index), array($value), array_slice($printAreas, $index));
+				$this->_printArea = implode(',', $printAreas);
 			}
 		} else {
     		throw new Exception('Invalid method for setting print range.');
@@ -729,7 +729,7 @@ 
 	 */
     public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
     {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method);
+    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1).$row1.':'.PHPExcel_Cell::stringFromColumnIndex($column2).$row2, $index, $method);
     }
 
 	/**
@@ -750,7 +750,7 @@ 
 	 */
     public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
     {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT);
+    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1).$row1.':'.PHPExcel_Cell::stringFromColumnIndex($column2).$row2, $index, self::SETPRINTRANGE_INSERT);
 	}
 
 	/**

Indentation +92 added lines, -92 removed lines

@@ -209,27 +209,27 @@ 
 	private $_scale			= 100;
 
 	/**
-	  * Fit To Page
-	  * Whether scale or fitToWith / fitToHeight applies
-	  *
-	  * @var boolean
-	  */
+	 * Fit To Page
+	 * Whether scale or fitToWith / fitToHeight applies
+	 *
+	 * @var boolean
+	 */
 	private $_fitToPage		= FALSE;
 
 	/**
-	  * Fit To Height
-	  * Number of vertical pages to fit on
-	  *
-	  * @var int?
-	  */
+	 * Fit To Height
+	 * Number of vertical pages to fit on
+	 *
+	 * @var int?
+	 */
 	private $_fitToHeight	= 1;
 
 	/**
-	  * Fit To Width
-	  * Number of horizontal pages to fit on
-	  *
-	  * @var int?
-	  */
+	 * Fit To Width
+	 * Number of horizontal pages to fit on
+	 *
+	 * @var int?
+	 */
 	private $_fitToWidth	= 1;
 
 	/**
@@ -274,52 +274,52 @@ 
 	 */
 	private $_firstPageNumber = NULL;
 
-    /**
-     * Create a new PHPExcel_Worksheet_PageSetup
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get Paper Size
-     *
-     * @return int
-     */
-    public function getPaperSize() {
-    	return $this->_paperSize;
-    }
-
-    /**
-     * Set Paper Size
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
-    	$this->_paperSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Orientation
-     *
-     * @return string
-     */
-    public function getOrientation() {
-    	return $this->_orientation;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
-    	$this->_orientation = $pValue;
-    	return $this;
-    }
+	/**
+	 * Create a new PHPExcel_Worksheet_PageSetup
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Get Paper Size
+	 *
+	 * @return int
+	 */
+	public function getPaperSize() {
+		return $this->_paperSize;
+	}
+
+	/**
+	 * Set Paper Size
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_PageSetup
+	 */
+	public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
+		$this->_paperSize = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Orientation
+	 *
+	 * @return string
+	 */
+	public function getOrientation() {
+		return $this->_orientation;
+	}
+
+	/**
+	 * Set Orientation
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Worksheet_PageSetup
+	 */
+	public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
+		$this->_orientation = $pValue;
+		return $this;
+	}
 
 	/**
 	 * Get Scale
@@ -619,7 +619,7 @@ 
 			}
 		}
 
-    	return $this;
+		return $this;
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 					$index = count($printAreas) - abs($index) + 1;
 				}
 				if (($index <= 0) || ($index > count($printAreas))) {
-		    		throw new Exception('Invalid index for setting print range.');
+					throw new Exception('Invalid index for setting print range.');
 				}
 				$printAreas[$index-1] = $value;
 				$this->_printArea = implode(',',$printAreas);
@@ -675,16 +675,16 @@ 
 					$index = abs($index) - 1;
 				}
 				if ($index > count($printAreas)) {
-		    		throw new Exception('Invalid index for setting print range.');
+					throw new Exception('Invalid index for setting print range.');
 				}
 				$printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index));
 				$this->_printArea = implode(',',$printAreas);
 			}
 		} else {
-    		throw new Exception('Invalid method for setting print range.');
+			throw new Exception('Invalid method for setting print range.');
 		}
 
-    	return $this;
+		return $this;
 	}
 
 	/**
@@ -727,10 +727,10 @@ 
 	 * @return	PHPExcel_Worksheet_PageSetup
 	 * @throws	Exception
 	 */
-    public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method);
-    }
+	public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
+	{
+		return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method);
+	}
 
 	/**
 	 * Add a new print area to the list of print areas
@@ -748,9 +748,9 @@ 
 	 * @return	PHPExcel_Worksheet_PageSetup
 	 * @throws	Exception
 	 */
-    public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT);
+	public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
+	{
+		return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT);
 	}
 
 	/**
@@ -758,29 +758,29 @@ 
 	 *
 	 * @return int
 	 */
-    public function getFirstPageNumber() {
+	public function getFirstPageNumber() {
 		return $this->_firstPageNumber;
-    }
-
-    /**
-     * Set first page number
-     *
-     * @param int $value
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstPageNumber($value = null) {
+	}
+
+	/**
+	 * Set first page number
+	 *
+	 * @param int $value
+	 * @return PHPExcel_Worksheet_HeaderFooter
+	 */
+	public function setFirstPageNumber($value = null) {
 		$this->_firstPageNumber = $value;
 		return $this;
-    }
-
-    /**
-     * Reset first page number
-     *
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function resetFirstPageNumber() {
+	}
+
+	/**
+	 * Reset first page number
+	 *
+	 * @return PHPExcel_Worksheet_HeaderFooter
+	 */
+	public function resetFirstPageNumber() {
 		return $this->setFirstPageNumber(null);
-    }
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.

app/Vendor/PHPExcel/PHPExcel/Worksheet/RowDimension.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
     /**
      * Set Row Height
      *
-     * @param double $pValue
+     * @param integer $pValue
      * @return PHPExcel_Worksheet_RowDimension
      */
     public function setRowHeight($pValue = -1) {

Spacing +5 added lines, -5 removed lines

@@ -49,28 +49,28 @@ 
 	 *
 	 * @var double
 	 */
-	private $_rowHeight		= -1;
+	private $_rowHeight = -1;
 
 	/**
 	 * Visible?
 	 *
 	 * @var bool
 	 */
-	private $_visible		= true;
+	private $_visible = true;
 
 	/**
 	 * Outline level
 	 *
 	 * @var int
 	 */
-	private $_outlineLevel	= 0;
+	private $_outlineLevel = 0;
 
 	/**
 	 * Collapsed
 	 *
 	 * @var bool
 	 */
-	private $_collapsed		= false;
+	private $_collapsed = false;
 
 	/**
 	 * Index to cellXf. Null value means row has no explicit cellXf format.
@@ -87,7 +87,7 @@ 
     public function __construct($pIndex = 0)
     {
     	// Initialise values
-    	$this->_rowIndex		= $pIndex;
+    	$this->_rowIndex = $pIndex;
 
 		// set row dimension as unformatted by default
 		$this->_xfIndex = null;

Indentation +117 added lines, -117 removed lines

@@ -79,126 +79,126 @@
 	 */
 	private $_xfIndex;
 
-    /**
-     * Create a new PHPExcel_Worksheet_RowDimension
-     *
-     * @param int $pIndex Numeric row index
-     */
-    public function __construct($pIndex = 0)
-    {
-    	// Initialise values
-    	$this->_rowIndex		= $pIndex;
+	/**
+	 * Create a new PHPExcel_Worksheet_RowDimension
+	 *
+	 * @param int $pIndex Numeric row index
+	 */
+	public function __construct($pIndex = 0)
+	{
+		// Initialise values
+		$this->_rowIndex		= $pIndex;
 
 		// set row dimension as unformatted by default
 		$this->_xfIndex = null;
-    }
-
-    /**
-     * Get Row Index
-     *
-     * @return int
-     */
-    public function getRowIndex() {
-    	return $this->_rowIndex;
-    }
-
-    /**
-     * Set Row Index
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowIndex($pValue) {
-    	$this->_rowIndex = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Row Height
-     *
-     * @return double
-     */
-    public function getRowHeight() {
-    	return $this->_rowHeight;
-    }
-
-    /**
-     * Set Row Height
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowHeight($pValue = -1) {
-    	$this->_rowHeight = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
-
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws Exception
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new Exception("Outline level must range between 0 and 7.");
-    	}
-
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
-
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
+	}
+
+	/**
+	 * Get Row Index
+	 *
+	 * @return int
+	 */
+	public function getRowIndex() {
+		return $this->_rowIndex;
+	}
+
+	/**
+	 * Set Row Index
+	 *
+	 * @param int $pValue
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setRowIndex($pValue) {
+		$this->_rowIndex = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Row Height
+	 *
+	 * @return double
+	 */
+	public function getRowHeight() {
+		return $this->_rowHeight;
+	}
+
+	/**
+	 * Set Row Height
+	 *
+	 * @param double $pValue
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setRowHeight($pValue = -1) {
+		$this->_rowHeight = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Visible
+	 *
+	 * @return bool
+	 */
+	public function getVisible() {
+		return $this->_visible;
+	}
+
+	/**
+	 * Set Visible
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setVisible($pValue = true) {
+		$this->_visible = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Outline Level
+	 *
+	 * @return int
+	 */
+	public function getOutlineLevel() {
+		return $this->_outlineLevel;
+	}
+
+	/**
+	 * Set Outline Level
+	 *
+	 * Value must be between 0 and 7
+	 *
+	 * @param int $pValue
+	 * @throws Exception
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setOutlineLevel($pValue) {
+		if ($pValue < 0 || $pValue > 7) {
+			throw new Exception("Outline level must range between 0 and 7.");
+		}
+
+		$this->_outlineLevel = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get Collapsed
+	 *
+	 * @return bool
+	 */
+	public function getCollapsed() {
+		return $this->_collapsed;
+	}
+
+	/**
+	 * Set Collapsed
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setCollapsed($pValue = true) {
+		$this->_collapsed = $pValue;
+		return $this;
+	}
 
 	/**
 	 * Get index to cellXf

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Escher.php

Doc Comments +1 added lines

@@ -65,6 +65,7 @@
 
 	/**
 	 * Process the object to be written
+	 * @return string
 	 */
 	public function close()
 	{

Switch Indentation +302 added lines, -302 removed lines

@@ -73,426 +73,426 @@
 
 		switch (get_class($this->_object)) {
 
-		case 'PHPExcel_Shared_Escher':
-			if ($dggContainer = $this->_object->getDggContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
-				$this->_data = $writer->close();
-			} else if ($dgContainer = $this->_object->getDgContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
-				$this->_data = $writer->close();
-				$this->_spOffsets = $writer->getSpOffsets();
-			}
-			break;
+			case 'PHPExcel_Shared_Escher':
+				if ($dggContainer = $this->_object->getDggContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
+					$this->_data = $writer->close();
+				} else if ($dgContainer = $this->_object->getDgContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
+					$this->_data = $writer->close();
+					$this->_spOffsets = $writer->getSpOffsets();
+				}
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DggContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// write the dgg
-			$recVer			= 0x0;
-			$recInstance	= 0x0000;
-			$recType		= 0xF006;
+				// write the dgg
+				$recVer			= 0x0;
+				$recInstance	= 0x0000;
+				$recType		= 0xF006;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			// dgg data
-			$dggData =
-				pack('VVVV'
-					, $this->_object->getSpIdMax() // maximum shape identifier increased by one
-					, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
-					, $this->_object->getCSpSaved()
-					, $this->_object->getCDgSaved() // count total number of drawings saved
-				);
+				// dgg data
+				$dggData =
+					pack('VVVV'
+						, $this->_object->getSpIdMax() // maximum shape identifier increased by one
+						, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
+						, $this->_object->getCSpSaved()
+						, $this->_object->getCDgSaved() // count total number of drawings saved
+					);
 
-			// add file identifier clusters (one per drawing)
-			$IDCLs = $this->_object->getIDCLs();
+				// add file identifier clusters (one per drawing)
+				$IDCLs = $this->_object->getIDCLs();
 
-			foreach ($IDCLs as $dgId => $maxReducedSpId) {
-				$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
-			}
+				foreach ($IDCLs as $dgId => $maxReducedSpId) {
+					$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
+				}
 
-			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
+				$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
+				$innerData .= $header . $dggData;
 
-			// write the bstoreContainer
-			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
-				$innerData .= $writer->close();
-			}
+				// write the bstoreContainer
+				if ($bstoreContainer = $this->_object->getBstoreContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
+					$innerData .= $writer->close();
+				}
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF000;
-			$length			= strlen($innerData);
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF000;
+				$length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			break;
+				$this->_data = $header . $innerData;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// treat the inner data
-			if ($BSECollection = $this->_object->getBSECollection()) {
-				foreach ($BSECollection as $BSE) {
-					$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
-					$innerData .= $writer->close();
+				// treat the inner data
+				if ($BSECollection = $this->_object->getBSECollection()) {
+					foreach ($BSECollection as $BSE) {
+						$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
+						$innerData .= $writer->close();
+					}
 				}
-			}
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
-			$recType		= 0xF001;
-			$length			= strlen($innerData);
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= count($this->_object->getBSECollection());
+				$recType		= 0xF001;
+				$length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			break;
+				$this->_data = $header . $innerData;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
-			// this is a semi-container record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
+				// this is a semi-container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
 
-			// here we treat the inner data
-			if ($blip = $this->_object->getBlip()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
-				$innerData .= $writer->close();
-			}
+				// here we treat the inner data
+				if ($blip = $this->_object->getBlip()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($blip);
+					$innerData .= $writer->close();
+				}
 
-			// initialize
-			$data = '';
+				// initialize
+				$data = '';
 
-			$btWin32 = $this->_object->getBlipType();
-			$btMacOS = $this->_object->getBlipType();
-			$data .= pack('CC', $btWin32, $btMacOS);
+				$btWin32 = $this->_object->getBlipType();
+				$btMacOS = $this->_object->getBlipType();
+				$data .= pack('CC', $btWin32, $btMacOS);
 
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
-			$data .= $rgbUid;
+				$rgbUid = pack('VVVV', 0,0,0,0); // todo
+				$data .= $rgbUid;
 
-			$tag = 0;
-			$size = strlen($innerData);
-			$cRef = 1;
-			$foDelay = 0; //todo
-			$unused1 = 0x0;
-			$cbName = 0x0;
-			$unused2 = 0x0;
-			$unused3 = 0x0;
-			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
+				$tag = 0;
+				$size = strlen($innerData);
+				$cRef = 1;
+				$foDelay = 0; //todo
+				$unused1 = 0x0;
+				$cbName = 0x0;
+				$unused2 = 0x0;
+				$unused3 = 0x0;
+				$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
 
-			$data .= $innerData;
+				$data .= $innerData;
 
-			// write the record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
-			$recType		= 0xF007;
-			$length			= strlen($data);
+				// write the record
+				$recVer			= 0x2;
+				$recInstance	= $this->_object->getBlipType();
+				$recType		= 0xF007;
+				$length			= strlen($data);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
+				$recVerInstance  = $recVer;
+				$recVerInstance |=	$recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header;
+				$this->_data = $header;
 
-			$this->_data .= $data;
-			break;
+				$this->_data .= $data;
+				break;
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
-			// this is an atom record
+			case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
+				// this is an atom record
 
-			// write the record
-			switch ($this->_object->getParent()->getBlipType()) {
+				// write the record
+				switch ($this->_object->getParent()->getBlipType()) {
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-				// initialize
-				$innerData = '';
+					case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+						// initialize
+						$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+						$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+						$innerData .= $rgbUid1;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
+						$tag = 0xFF; // todo
+						$innerData .= pack('C', $tag);
 
-				$innerData .= $this->_object->getData();
+						$innerData .= $this->_object->getData();
 
-				$recVer			= 0x0;
-				$recInstance	= 0x46A;
-				$recType		= 0xF01D;
-				$length			= strlen($innerData);
+						$recVer			= 0x0;
+						$recInstance	= 0x46A;
+						$recType		= 0xF01D;
+						$length			= strlen($innerData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+						$recVerInstance  = $recVer;
+						$recVerInstance |=	$recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+						$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$this->_data = $header;
+						$this->_data = $header;
 
-				$this->_data .= $innerData;
-				break;
+						$this->_data .= $innerData;
+						break;
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-				// initialize
-				$innerData = '';
+					case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+						// initialize
+						$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+						$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+						$innerData .= $rgbUid1;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
+						$tag = 0xFF; // todo
+						$innerData .= pack('C', $tag);
 
-				$innerData .= $this->_object->getData();
+						$innerData .= $this->_object->getData();
 
-				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
-				$recType		= 0xF01E;
-				$length			= strlen($innerData);
+						$recVer			= 0x0;
+						$recInstance	= 0x6E0;
+						$recType		= 0xF01E;
+						$length			= strlen($innerData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+						$recVerInstance  = $recVer;
+						$recVerInstance |=	$recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+						$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$this->_data = $header;
+						$this->_data = $header;
 
-				$this->_data .= $innerData;
-				break;
+						$this->_data .= $innerData;
+						break;
 
-			}
+				}
 			break;
 
-		case 'PHPExcel_Shared_Escher_DgContainer':
-			// this is a container record
+			case 'PHPExcel_Shared_Escher_DgContainer':
+				// this is a container record
 
-			// initialize
-			$innerData = '';
+				// initialize
+				$innerData = '';
+
+				// write the dg
+				$recVer			= 0x0;
+				$recInstance	= $this->_object->getDgId();
+				$recType		= 0xF008;
+				$length			= 8;
 
-			// write the dg
-			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
-			$recType		= 0xF008;
-			$length			= 8;
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				// number of shapes in this drawing (including group shape)
+				$countShapes = count($this->_object->getSpgrContainer()->getChildren());
+				$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
+				//$innerData .= $header . pack('VV', 0, 0);
 
-			// number of shapes in this drawing (including group shape)
-			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
-			//$innerData .= $header . pack('VV', 0, 0);
+				// write the spgrContainer
+				if ($spgrContainer = $this->_object->getSpgrContainer()) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
+					$innerData .= $writer->close();
 
-			// write the spgrContainer
-			if ($spgrContainer = $this->_object->getSpgrContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
-				$innerData .= $writer->close();
+					// get the shape offsets relative to the spgrContainer record
+					$spOffsets = $writer->getSpOffsets();
 
-				// get the shape offsets relative to the spgrContainer record
-				$spOffsets = $writer->getSpOffsets();
+					// save the shape offsets relative to dgContainer
+					foreach ($spOffsets as & $spOffset) {
+						$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+					}
 
-				// save the shape offsets relative to dgContainer
-				foreach ($spOffsets as & $spOffset) {
-					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+					$this->_spOffsets = $spOffsets;
 				}
 
-				$this->_spOffsets = $spOffsets;
-			}
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF002;
+				$length			= strlen($innerData);
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF002;
-			$length			= strlen($innerData);
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$this->_data = $header . $innerData;
+				break;
 
-			$this->_data = $header . $innerData;
-			break;
+			case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
+				// this is a container record
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
-			// this is a container record
+				// initialize
+				$innerData = '';
 
-			// initialize
-			$innerData = '';
+				// initialize spape offsets
+				$totalSize = 8;
+				$spOffsets = array();
 
-			// initialize spape offsets
-			$totalSize = 8;
-			$spOffsets = array();
+				// treat the inner data
+				foreach ($this->_object->getChildren() as $spContainer) {
+					$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
+					$spData = $writer->close();
+					$innerData .= $spData;
 
-			// treat the inner data
-			foreach ($this->_object->getChildren() as $spContainer) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
-				$spData = $writer->close();
-				$innerData .= $spData;
+					// save the shape offsets (where new shape records begin)
+					$totalSize += strlen($spData);
+					$spOffsets[] = $totalSize;
+				}
 
-				// save the shape offsets (where new shape records begin)
-				$totalSize += strlen($spData);
-				$spOffsets[] = $totalSize;
-			}
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF003;
+				$length			= strlen($innerData);
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF003;
-			$length			= strlen($innerData);
+				$recVerInstance  = $recVer;
+				$recVerInstance |= $recInstance << 4;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				$this->_data = $header . $innerData;
+				$this->_spOffsets = $spOffsets;
+				break;
 
-			$this->_data = $header . $innerData;
-			$this->_spOffsets = $spOffsets;
-			break;
+			case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
+				// initialize
+				$data = '';
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
-			// initialize
-			$data = '';
+				// build the data
 
-			// build the data
+				// write group shape record, if necessary?
+				if ($this->_object->getSpgr()) {
+					$recVer			= 0x1;
+					$recInstance	= 0x0000;
+					$recType		= 0xF009;
+					$length			= 0x00000010;
 
-			// write group shape record, if necessary?
-			if ($this->_object->getSpgr()) {
-				$recVer			= 0x1;
-				$recInstance	= 0x0000;
-				$recType		= 0xF009;
-				$length			= 0x00000010;
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
+
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+
+					$data .= $header . pack('VVVV', 0,0,0,0);
+				}
+
+				// write the shape record
+				$recVer			= 0x2;
+				$recInstance	= $this->_object->getSpType(); // shape type
+				$recType		= 0xF00A;
+				$length			= 0x00000008;
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$data .= $header . pack('VVVV', 0,0,0,0);
-			}
-
-			// write the shape record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
-			$recType		= 0xF00A;
-			$length			= 0x00000008;
+				$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+				// the options
+				if ($this->_object->getOPTCollection()) {
+					$optData = '';
 
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
+					$recVer			= 0x3;
+					$recInstance	= count($this->_object->getOPTCollection());
+					$recType		= 0xF00B;
+					foreach ($this->_object->getOPTCollection() as $property => $value) {
+						$optData .= pack('vV', $property, $value);
+					}
+					$length			= strlen($optData);
 
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-			// the options
-			if ($this->_object->getOPTCollection()) {
-				$optData = '';
-
-				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
-				$recType		= 0xF00B;
-				foreach ($this->_object->getOPTCollection() as $property => $value) {
-					$optData .= pack('vV', $property, $value);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $optData;
 				}
-				$length			= strlen($optData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				// the client anchor
+				if ($this->_object->getStartCoordinates()) {
+					$clientAnchorData = '';
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
-			}
+					$recVer			= 0x0;
+					$recInstance	= 0x0;
+					$recType		= 0xF010;
 
-			// the client anchor
-			if ($this->_object->getStartCoordinates()) {
-				$clientAnchorData = '';
+					// start coordinates
+					list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
+					$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+					$r1 = $row - 1;
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF010;
+					// start offsetX
+					$startOffsetX = $this->_object->getStartOffsetX();
 
-				// start coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
-				$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r1 = $row - 1;
+					// start offsetY
+					$startOffsetY = $this->_object->getStartOffsetY();
 
-				// start offsetX
-				$startOffsetX = $this->_object->getStartOffsetX();
+					// end coordinates
+					list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
+					$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+					$r2 = $row - 1;
 
-				// start offsetY
-				$startOffsetY = $this->_object->getStartOffsetY();
+					// end offsetX
+					$endOffsetX = $this->_object->getEndOffsetX();
 
-				// end coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
-				$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r2 = $row - 1;
+					// end offsetY
+					$endOffsetY = $this->_object->getEndOffsetY();
 
-				// end offsetX
-				$endOffsetX = $this->_object->getEndOffsetX();
+					$clientAnchorData = pack('vvvvvvvvv', 0x02,
+						$c1, $startOffsetX, $r1, $startOffsetY,
+						$c2, $endOffsetX, $r2, $endOffsetY);
 
-				// end offsetY
-				$endOffsetY = $this->_object->getEndOffsetY();
+					$length			= strlen($clientAnchorData);
 
-				$clientAnchorData = pack('vvvvvvvvv', 0x02,
-					$c1, $startOffsetX, $r1, $startOffsetY,
-					$c2, $endOffsetX, $r2, $endOffsetY);
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-				$length			= strlen($clientAnchorData);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $clientAnchorData;
+				}
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				// the client data, just empty for now
+				if (!$this->_object->getSpgr()) {
+					$clientDataData = '';
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
-			}
+					$recVer			= 0x0;
+					$recInstance	= 0x0;
+					$recType		= 0xF011;
 
-			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
-				$clientDataData = '';
+					$length = strlen($clientDataData);
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF011;
+					$recVerInstance  = $recVer;
+					$recVerInstance |= $recInstance << 4;
 
-				$length = strlen($clientDataData);
+					$header = pack('vvV', $recVerInstance, $recType, $length);
+					$data .= $header . $clientDataData;
+				}
+
+				// write the record
+				$recVer			= 0xF;
+				$recInstance	= 0x0000;
+				$recType		= 0xF004;
+				$length			= strlen($data);
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF004;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $data;
-			break;
+				$this->_data = $header . $data;
+				break;
 
 		}
 

Spacing +36 added lines, -36 removed lines

@@ -92,7 +92,7 @@ 
 
 			// write the dgg
 			$recVer			= 0x0;
-			$recInstance	= 0x0000;
+			$recInstance = 0x0000;
 			$recType		= 0xF006;
 
 			$recVerInstance  = $recVer;
@@ -115,7 +115,7 @@ 
 			}
 
 			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
+			$innerData .= $header.$dggData;
 
 			// write the bstoreContainer
 			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
@@ -125,7 +125,7 @@ 
 
 			// write the record
 			$recVer			= 0xF;
-			$recInstance	= 0x0000;
+			$recInstance = 0x0000;
 			$recType		= 0xF000;
 			$length			= strlen($innerData);
 
@@ -134,7 +134,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
+			$this->_data = $header.$innerData;
 			break;
 
 		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
@@ -153,7 +153,7 @@ 
 
 			// write the record
 			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
+			$recInstance = count($this->_object->getBSECollection());
 			$recType		= 0xF001;
 			$length			= strlen($innerData);
 
@@ -162,7 +162,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
+			$this->_data = $header.$innerData;
 			break;
 
 		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
@@ -184,7 +184,7 @@ 
 			$btMacOS = $this->_object->getBlipType();
 			$data .= pack('CC', $btWin32, $btMacOS);
 
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
+			$rgbUid = pack('VVVV', 0, 0, 0, 0); // todo
 			$data .= $rgbUid;
 
 			$tag = 0;
@@ -201,12 +201,12 @@ 
 
 			// write the record
 			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
+			$recInstance = $this->_object->getBlipType();
 			$recType		= 0xF007;
 			$length			= strlen($data);
 
 			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
+			$recVerInstance |= $recInstance << 4;
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -225,7 +225,7 @@ 
 				// initialize
 				$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+				$rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
 				$innerData .= $rgbUid1;
 
 				$tag = 0xFF; // todo
@@ -234,12 +234,12 @@ 
 				$innerData .= $this->_object->getData();
 
 				$recVer			= 0x0;
-				$recInstance	= 0x46A;
+				$recInstance = 0x46A;
 				$recType		= 0xF01D;
 				$length			= strlen($innerData);
 
 				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -252,7 +252,7 @@ 
 				// initialize
 				$innerData = '';
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+				$rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
 				$innerData .= $rgbUid1;
 
 				$tag = 0xFF; // todo
@@ -261,12 +261,12 @@ 
 				$innerData .= $this->_object->getData();
 
 				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
+				$recInstance = 0x6E0;
 				$recType		= 0xF01E;
 				$length			= strlen($innerData);
 
 				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -286,7 +286,7 @@ 
 
 			// write the dg
 			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
+			$recInstance = $this->_object->getDgId();
 			$recType		= 0xF008;
 			$length			= 8;
 
@@ -297,7 +297,7 @@ 
 
 			// number of shapes in this drawing (including group shape)
 			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
+			$innerData .= $header.pack('VV', $countShapes, $this->_object->getLastSpId());
 			//$innerData .= $header . pack('VV', 0, 0);
 
 			// write the spgrContainer
@@ -318,7 +318,7 @@ 
 
 			// write the record
 			$recVer			= 0xF;
-			$recInstance	= 0x0000;
+			$recInstance = 0x0000;
 			$recType		= 0xF002;
 			$length			= strlen($innerData);
 
@@ -327,7 +327,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
+			$this->_data = $header.$innerData;
 			break;
 
 		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
@@ -353,7 +353,7 @@ 
 
 			// write the record
 			$recVer			= 0xF;
-			$recInstance	= 0x0000;
+			$recInstance = 0x0000;
 			$recType		= 0xF003;
 			$length			= strlen($innerData);
 
@@ -362,7 +362,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
+			$this->_data = $header.$innerData;
 			$this->_spOffsets = $spOffsets;
 			break;
 
@@ -375,7 +375,7 @@ 
 			// write group shape record, if necessary?
 			if ($this->_object->getSpgr()) {
 				$recVer			= 0x1;
-				$recInstance	= 0x0000;
+				$recInstance = 0x0000;
 				$recType		= 0xF009;
 				$length			= 0x00000010;
 
@@ -384,12 +384,12 @@ 
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$data .= $header . pack('VVVV', 0,0,0,0);
+				$data .= $header.pack('VVVV', 0, 0, 0, 0);
 			}
 
 			// write the shape record
 			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
+			$recInstance = $this->_object->getSpType(); // shape type
 			$recType		= 0xF00A;
 			$length			= 0x00000008;
 
@@ -398,7 +398,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
+			$data .= $header.pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
 
 
 			// the options
@@ -406,18 +406,18 @@ 
 				$optData = '';
 
 				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
+				$recInstance = count($this->_object->getOPTCollection());
 				$recType		= 0xF00B;
 				foreach ($this->_object->getOPTCollection() as $property => $value) {
 					$optData .= pack('vV', $property, $value);
 				}
-				$length			= strlen($optData);
+				$length = strlen($optData);
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
+				$data .= $header.$optData;
 			}
 
 			// the client anchor
@@ -425,7 +425,7 @@ 
 				$clientAnchorData = '';
 
 				$recVer			= 0x0;
-				$recInstance	= 0x0;
+				$recInstance = 0x0;
 				$recType		= 0xF010;
 
 				// start coordinates
@@ -454,21 +454,21 @@ 
 					$c1, $startOffsetX, $r1, $startOffsetY,
 					$c2, $endOffsetX, $r2, $endOffsetY);
 
-				$length			= strlen($clientAnchorData);
+				$length = strlen($clientAnchorData);
 
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
+				$data .= $header.$clientAnchorData;
 			}
 
 			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
+			if ( ! $this->_object->getSpgr()) {
 				$clientDataData = '';
 
 				$recVer			= 0x0;
-				$recInstance	= 0x0;
+				$recInstance = 0x0;
 				$recType		= 0xF011;
 
 				$length = strlen($clientDataData);
@@ -477,12 +477,12 @@ 
 				$recVerInstance |= $recInstance << 4;
 
 				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
+				$data .= $header.$clientDataData;
 			}
 
 			// write the record
 			$recVer			= 0xF;
-			$recInstance	= 0x0000;
+			$recInstance = 0x0000;
 			$recType		= 0xF004;
 			$length			= strlen($data);
 
@@ -491,7 +491,7 @@ 
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $data;
+			$this->_data = $header.$data;
 			break;
 
 		}

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Parser.php

Doc Comments +9 added lines, -9 removed lines

@@ -510,7 +510,7 @@ 
 	 *
 	 * @access private
 	 * @param mixed $token The token to convert.
-	 * @return mixed the converted token on success
+	 * @return string the converted token on success
 	 */
 	function _convert($token)
 	{
@@ -591,7 +591,7 @@ 
 	 *
 	 * @access private
 	 * @param string $string A string for conversion to its ptg value.
-	 * @return mixed the converted token on success
+	 * @return string the converted token on success
 	 */
 	function _convertString($string)
 	{
@@ -671,7 +671,7 @@ 
 	 *
 	 * @access private
 	 * @param string $token An Excel range in the Sheet1!A1:A2 format.
-	 * @return mixed The packed ptgArea3d token on success.
+	 * @return string The packed ptgArea3d token on success.
 	 */
 	function _convertRange3d($token)
 	{
@@ -743,7 +743,7 @@ 
 	 *
 	 * @access private
 	 * @param string $cell An Excel cell reference
-	 * @return mixed The packed ptgRef3d token on success.
+	 * @return string The packed ptgRef3d token on success.
 	 */
 	function _convertRef3d($cell)
 	{
@@ -844,7 +844,7 @@ 
 	 *
 	 * @access private
 	 * @param string $ext_ref The name of the external reference
-	 * @return mixed The reference index in packed() format on success
+	 * @return string The reference index in packed() format on success
 	 */
 	function _getRefIndex($ext_ref)
 	{
@@ -935,7 +935,7 @@ 
 	 *
 	 * @access private
 	 * @param string $cell The Excel cell reference to be packed
-	 * @return array Array containing the row and column in packed() format
+	 * @return string[] Array containing the row and column in packed() format
 	 */
 	function _cellToPackedRowcol($cell)
 	{
@@ -965,7 +965,7 @@ 
 	 *
 	 * @access private
 	 * @param string $range The Excel range to be packed
-	 * @return array Array containing (row1,col1,row2,col2) in packed() format
+	 * @return string[] Array containing (row1,col1,row2,col2) in packed() format
 	 */
 	function _rangeToPackedRange($range)
 	{
@@ -1086,7 +1086,7 @@ 
 	 * Checks if it's a valid token.
 	 *
 	 * @access private
-	 * @param mixed $token The token to check.
+	 * @param string $token The token to check.
 	 * @return mixed       The checked token or false on failure
 	 */
 	function _match($token)
@@ -1200,7 +1200,7 @@ 
 	 * @access public
 	 * @param string $formula The formula to parse, without the initial equal
 	 *                        sign (=).
-	 * @return mixed true on success
+	 * @return boolean true on success
 	 */
 	function parse($formula)
 	{

Indentation +33 added lines, -33 removed lines

@@ -548,9 +548,9 @@ 
 		} elseif (isset($this->ptg[$token])) {
 			return pack("C", $this->ptg[$token]);
 
-        // match error codes
+		// match error codes
 		} elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
-		    return $this->_convertError($token);
+			return $this->_convertError($token);
 
 		// commented so argument number can be processed correctly. See toReversePolish().
 		/*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/",$token))
@@ -772,15 +772,15 @@ 
 		return $ptgRef . $ext_ref. $row . $col;
 	}
 
-    /**
-     * Convert an error code to a ptgErr
-     *
-     * @access	private
+	/**
+	 * Convert an error code to a ptgErr
+	 *
+	 * @access	private
 	 * @param	string	$errorCode	The error code for conversion to its ptg value
-     * @return	string				The error code ptgErr
-     */
-    function _convertError($errorCode)
-    {
+	 * @return	string				The error code ptgErr
+	 */
+	function _convertError($errorCode)
+	{
 		switch ($errorCode) {
 			case '#NULL!':	return pack("C", 0x00);
 			case '#DIV/0!':	return pack("C", 0x07);
@@ -791,7 +791,7 @@ 
 			case '#N/A':	return pack("C", 0x2A);
 		}
 		return pack("C", 0xFF);
-    }
+	}
 
 	/**
 	 * Convert the sheet name part of an external reference, for example "Sheet1" or
@@ -1175,11 +1175,11 @@ 
 				{
 					return $token;
 				}
-			    // If it's an error code
-			    elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A')
-			    {
-			        return $token;
-			    }
+				// If it's an error code
+				elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A')
+				{
+					return $token;
+				}
 				// if it's a function call
 				elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "("))
 				{
@@ -1247,9 +1247,9 @@ 
 			$result2 = $this->_expression();
 			$result = $this->_createTree('ptgNE', $result, $result2);
 		} elseif ($this->_current_token == "&") {
-		    $this->_advance();
-		    $result2 = $this->_expression();
-		    $result = $this->_createTree('ptgConcat', $result, $result2);
+			$this->_advance();
+			$result2 = $this->_expression();
+			$result = $this->_createTree('ptgConcat', $result, $result2);
 		}
 		return $result;
 	}
@@ -1274,19 +1274,19 @@ 
 			$result = $this->_createTree($tmp, '', '');
 			$this->_advance();
 			return $result;
-        // If it's an error code
-        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
-		    $result = $this->_createTree($this->_current_token, 'ptgErr', '');
-		    $this->_advance();
-		    return $result;
+		// If it's an error code
+		} elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
+			$result = $this->_createTree($this->_current_token, 'ptgErr', '');
+			$this->_advance();
+			return $result;
 		// If it's a negative value
-        } elseif ($this->_current_token == "-") {
+		} elseif ($this->_current_token == "-") {
 			// catch "-" Term
 			$this->_advance();
 			$result2 = $this->_expression();
 			$result = $this->_createTree('ptgUminus', $result2, '');
 			return $result;
-        // If it's a positive value
+		// If it's a positive value
 		} elseif ($this->_current_token == "+") {
 			// catch "+" Term
 			$this->_advance();
@@ -1429,13 +1429,13 @@ 
 		// If it's a number or a percent
 		elseif (is_numeric($this->_current_token))
 		{
-		    if($this->_lookahead == '%'){
-		        $result = $this->_createTree('ptgPercent', $this->_current_token, '');
-		    } else {
-		        $result = $this->_createTree($this->_current_token, '', '');
-		    }
-		    $this->_advance();
-		    return $result;
+			if($this->_lookahead == '%'){
+				$result = $this->_createTree('ptgPercent', $this->_current_token, '');
+			} else {
+				$result = $this->_createTree($this->_current_token, '', '');
+			}
+			$this->_advance();
+			return $result;
 		}
 		// if it's a function call
 		elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token))

Spacing +309 added lines, -309 removed lines

@@ -122,11 +122,11 @@ 
 	public function __construct()
 	{
 		$this->_current_char  = 0;
-		$this->_current_token = '';       // The token we are working on.
-		$this->_formula       = '';       // The formula to parse.
-		$this->_lookahead     = '';       // The character ahead of the current char.
-		$this->_parse_tree    = '';       // The parse tree to be generated.
-		$this->_initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
+		$this->_current_token = ''; // The token we are working on.
+		$this->_formula       = ''; // The formula to parse.
+		$this->_lookahead     = ''; // The character ahead of the current char.
+		$this->_parse_tree    = ''; // The parse tree to be generated.
+		$this->_initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
 		$this->_ext_sheets = array();
 		$this->_references = array();
 	}
@@ -252,256 +252,256 @@ 
 		//
 		$this->_functions = array(
 			  // function                  ptg  args  class  vol
-			  'COUNT'           => array(   0,   -1,    0,    0 ),
-			  'IF'              => array(   1,   -1,    1,    0 ),
-			  'ISNA'            => array(   2,    1,    1,    0 ),
-			  'ISERROR'         => array(   3,    1,    1,    0 ),
-			  'SUM'             => array(   4,   -1,    0,    0 ),
-			  'AVERAGE'         => array(   5,   -1,    0,    0 ),
-			  'MIN'             => array(   6,   -1,    0,    0 ),
-			  'MAX'             => array(   7,   -1,    0,    0 ),
-			  'ROW'             => array(   8,   -1,    0,    0 ),
-			  'COLUMN'          => array(   9,   -1,    0,    0 ),
-			  'NA'              => array(  10,    0,    0,    0 ),
-			  'NPV'             => array(  11,   -1,    1,    0 ),
-			  'STDEV'           => array(  12,   -1,    0,    0 ),
-			  'DOLLAR'          => array(  13,   -1,    1,    0 ),
-			  'FIXED'           => array(  14,   -1,    1,    0 ),
-			  'SIN'             => array(  15,    1,    1,    0 ),
-			  'COS'             => array(  16,    1,    1,    0 ),
-			  'TAN'             => array(  17,    1,    1,    0 ),
-			  'ATAN'            => array(  18,    1,    1,    0 ),
-			  'PI'              => array(  19,    0,    1,    0 ),
-			  'SQRT'            => array(  20,    1,    1,    0 ),
-			  'EXP'             => array(  21,    1,    1,    0 ),
-			  'LN'              => array(  22,    1,    1,    0 ),
-			  'LOG10'           => array(  23,    1,    1,    0 ),
-			  'ABS'             => array(  24,    1,    1,    0 ),
-			  'INT'             => array(  25,    1,    1,    0 ),
-			  'SIGN'            => array(  26,    1,    1,    0 ),
-			  'ROUND'           => array(  27,    2,    1,    0 ),
-			  'LOOKUP'          => array(  28,   -1,    0,    0 ),
-			  'INDEX'           => array(  29,   -1,    0,    1 ),
-			  'REPT'            => array(  30,    2,    1,    0 ),
-			  'MID'             => array(  31,    3,    1,    0 ),
-			  'LEN'             => array(  32,    1,    1,    0 ),
-			  'VALUE'           => array(  33,    1,    1,    0 ),
-			  'TRUE'            => array(  34,    0,    1,    0 ),
-			  'FALSE'           => array(  35,    0,    1,    0 ),
-			  'AND'             => array(  36,   -1,    0,    0 ),
-			  'OR'              => array(  37,   -1,    0,    0 ),
-			  'NOT'             => array(  38,    1,    1,    0 ),
-			  'MOD'             => array(  39,    2,    1,    0 ),
-			  'DCOUNT'          => array(  40,    3,    0,    0 ),
-			  'DSUM'            => array(  41,    3,    0,    0 ),
-			  'DAVERAGE'        => array(  42,    3,    0,    0 ),
-			  'DMIN'            => array(  43,    3,    0,    0 ),
-			  'DMAX'            => array(  44,    3,    0,    0 ),
-			  'DSTDEV'          => array(  45,    3,    0,    0 ),
-			  'VAR'             => array(  46,   -1,    0,    0 ),
-			  'DVAR'            => array(  47,    3,    0,    0 ),
-			  'TEXT'            => array(  48,    2,    1,    0 ),
-			  'LINEST'          => array(  49,   -1,    0,    0 ),
-			  'TREND'           => array(  50,   -1,    0,    0 ),
-			  'LOGEST'          => array(  51,   -1,    0,    0 ),
-			  'GROWTH'          => array(  52,   -1,    0,    0 ),
-			  'PV'              => array(  56,   -1,    1,    0 ),
-			  'FV'              => array(  57,   -1,    1,    0 ),
-			  'NPER'            => array(  58,   -1,    1,    0 ),
-			  'PMT'             => array(  59,   -1,    1,    0 ),
-			  'RATE'            => array(  60,   -1,    1,    0 ),
-			  'MIRR'            => array(  61,    3,    0,    0 ),
-			  'IRR'             => array(  62,   -1,    0,    0 ),
-			  'RAND'            => array(  63,    0,    1,    1 ),
-			  'MATCH'           => array(  64,   -1,    0,    0 ),
-			  'DATE'            => array(  65,    3,    1,    0 ),
-			  'TIME'            => array(  66,    3,    1,    0 ),
-			  'DAY'             => array(  67,    1,    1,    0 ),
-			  'MONTH'           => array(  68,    1,    1,    0 ),
-			  'YEAR'            => array(  69,    1,    1,    0 ),
-			  'WEEKDAY'         => array(  70,   -1,    1,    0 ),
-			  'HOUR'            => array(  71,    1,    1,    0 ),
-			  'MINUTE'          => array(  72,    1,    1,    0 ),
-			  'SECOND'          => array(  73,    1,    1,    0 ),
-			  'NOW'             => array(  74,    0,    1,    1 ),
-			  'AREAS'           => array(  75,    1,    0,    1 ),
-			  'ROWS'            => array(  76,    1,    0,    1 ),
-			  'COLUMNS'         => array(  77,    1,    0,    1 ),
-			  'OFFSET'          => array(  78,   -1,    0,    1 ),
-			  'SEARCH'          => array(  82,   -1,    1,    0 ),
-			  'TRANSPOSE'       => array(  83,    1,    1,    0 ),
-			  'TYPE'            => array(  86,    1,    1,    0 ),
-			  'ATAN2'           => array(  97,    2,    1,    0 ),
-			  'ASIN'            => array(  98,    1,    1,    0 ),
-			  'ACOS'            => array(  99,    1,    1,    0 ),
-			  'CHOOSE'          => array( 100,   -1,    1,    0 ),
-			  'HLOOKUP'         => array( 101,   -1,    0,    0 ),
-			  'VLOOKUP'         => array( 102,   -1,    0,    0 ),
-			  'ISREF'           => array( 105,    1,    0,    0 ),
-			  'LOG'             => array( 109,   -1,    1,    0 ),
-			  'CHAR'            => array( 111,    1,    1,    0 ),
-			  'LOWER'           => array( 112,    1,    1,    0 ),
-			  'UPPER'           => array( 113,    1,    1,    0 ),
-			  'PROPER'          => array( 114,    1,    1,    0 ),
-			  'LEFT'            => array( 115,   -1,    1,    0 ),
-			  'RIGHT'           => array( 116,   -1,    1,    0 ),
-			  'EXACT'           => array( 117,    2,    1,    0 ),
-			  'TRIM'            => array( 118,    1,    1,    0 ),
-			  'REPLACE'         => array( 119,    4,    1,    0 ),
-			  'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
-			  'CODE'            => array( 121,    1,    1,    0 ),
-			  'FIND'            => array( 124,   -1,    1,    0 ),
-			  'CELL'            => array( 125,   -1,    0,    1 ),
-			  'ISERR'           => array( 126,    1,    1,    0 ),
-			  'ISTEXT'          => array( 127,    1,    1,    0 ),
-			  'ISNUMBER'        => array( 128,    1,    1,    0 ),
-			  'ISBLANK'         => array( 129,    1,    1,    0 ),
-			  'T'               => array( 130,    1,    0,    0 ),
-			  'N'               => array( 131,    1,    0,    0 ),
-			  'DATEVALUE'       => array( 140,    1,    1,    0 ),
-			  'TIMEVALUE'       => array( 141,    1,    1,    0 ),
-			  'SLN'             => array( 142,    3,    1,    0 ),
-			  'SYD'             => array( 143,    4,    1,    0 ),
-			  'DDB'             => array( 144,   -1,    1,    0 ),
-			  'INDIRECT'        => array( 148,   -1,    1,    1 ),
-			  'CALL'            => array( 150,   -1,    1,    0 ),
-			  'CLEAN'           => array( 162,    1,    1,    0 ),
-			  'MDETERM'         => array( 163,    1,    2,    0 ),
-			  'MINVERSE'        => array( 164,    1,    2,    0 ),
-			  'MMULT'           => array( 165,    2,    2,    0 ),
-			  'IPMT'            => array( 167,   -1,    1,    0 ),
-			  'PPMT'            => array( 168,   -1,    1,    0 ),
-			  'COUNTA'          => array( 169,   -1,    0,    0 ),
-			  'PRODUCT'         => array( 183,   -1,    0,    0 ),
-			  'FACT'            => array( 184,    1,    1,    0 ),
-			  'DPRODUCT'        => array( 189,    3,    0,    0 ),
-			  'ISNONTEXT'       => array( 190,    1,    1,    0 ),
-			  'STDEVP'          => array( 193,   -1,    0,    0 ),
-			  'VARP'            => array( 194,   -1,    0,    0 ),
-			  'DSTDEVP'         => array( 195,    3,    0,    0 ),
-			  'DVARP'           => array( 196,    3,    0,    0 ),
-			  'TRUNC'           => array( 197,   -1,    1,    0 ),
-			  'ISLOGICAL'       => array( 198,    1,    1,    0 ),
-			  'DCOUNTA'         => array( 199,    3,    0,    0 ),
-			  'USDOLLAR'        => array( 204,   -1,    1,    0 ),
-			  'FINDB'           => array( 205,   -1,    1,    0 ),
-			  'SEARCHB'         => array( 206,   -1,    1,    0 ),
-			  'REPLACEB'        => array( 207,    4,    1,    0 ),
-			  'LEFTB'           => array( 208,   -1,    1,    0 ),
-			  'RIGHTB'          => array( 209,   -1,    1,    0 ),
-			  'MIDB'            => array( 210,    3,    1,    0 ),
-			  'LENB'            => array( 211,    1,    1,    0 ),
-			  'ROUNDUP'         => array( 212,    2,    1,    0 ),
-			  'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
-			  'ASC'             => array( 214,    1,    1,    0 ),
-			  'DBCS'            => array( 215,    1,    1,    0 ),
-			  'RANK'            => array( 216,   -1,    0,    0 ),
-			  'ADDRESS'         => array( 219,   -1,    1,    0 ),
-			  'DAYS360'         => array( 220,   -1,    1,    0 ),
-			  'TODAY'           => array( 221,    0,    1,    1 ),
-			  'VDB'             => array( 222,   -1,    1,    0 ),
-			  'MEDIAN'          => array( 227,   -1,    0,    0 ),
-			  'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
-			  'SINH'            => array( 229,    1,    1,    0 ),
-			  'COSH'            => array( 230,    1,    1,    0 ),
-			  'TANH'            => array( 231,    1,    1,    0 ),
-			  'ASINH'           => array( 232,    1,    1,    0 ),
-			  'ACOSH'           => array( 233,    1,    1,    0 ),
-			  'ATANH'           => array( 234,    1,    1,    0 ),
-			  'DGET'            => array( 235,    3,    0,    0 ),
-			  'INFO'            => array( 244,    1,    1,    1 ),
-			  'DB'              => array( 247,   -1,    1,    0 ),
-			  'FREQUENCY'       => array( 252,    2,    0,    0 ),
-			  'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
-			  'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
-			  'AVEDEV'          => array( 269,   -1,    0,    0 ),
-			  'BETADIST'        => array( 270,   -1,    1,    0 ),
-			  'GAMMALN'         => array( 271,    1,    1,    0 ),
-			  'BETAINV'         => array( 272,   -1,    1,    0 ),
-			  'BINOMDIST'       => array( 273,    4,    1,    0 ),
-			  'CHIDIST'         => array( 274,    2,    1,    0 ),
-			  'CHIINV'          => array( 275,    2,    1,    0 ),
-			  'COMBIN'          => array( 276,    2,    1,    0 ),
-			  'CONFIDENCE'      => array( 277,    3,    1,    0 ),
-			  'CRITBINOM'       => array( 278,    3,    1,    0 ),
-			  'EVEN'            => array( 279,    1,    1,    0 ),
-			  'EXPONDIST'       => array( 280,    3,    1,    0 ),
-			  'FDIST'           => array( 281,    3,    1,    0 ),
-			  'FINV'            => array( 282,    3,    1,    0 ),
-			  'FISHER'          => array( 283,    1,    1,    0 ),
-			  'FISHERINV'       => array( 284,    1,    1,    0 ),
-			  'FLOOR'           => array( 285,    2,    1,    0 ),
-			  'GAMMADIST'       => array( 286,    4,    1,    0 ),
-			  'GAMMAINV'        => array( 287,    3,    1,    0 ),
-			  'CEILING'         => array( 288,    2,    1,    0 ),
-			  'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
-			  'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
-			  'LOGINV'          => array( 291,    3,    1,    0 ),
-			  'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
-			  'NORMDIST'        => array( 293,    4,    1,    0 ),
-			  'NORMSDIST'       => array( 294,    1,    1,    0 ),
-			  'NORMINV'         => array( 295,    3,    1,    0 ),
-			  'NORMSINV'        => array( 296,    1,    1,    0 ),
-			  'STANDARDIZE'     => array( 297,    3,    1,    0 ),
-			  'ODD'             => array( 298,    1,    1,    0 ),
-			  'PERMUT'          => array( 299,    2,    1,    0 ),
-			  'POISSON'         => array( 300,    3,    1,    0 ),
-			  'TDIST'           => array( 301,    3,    1,    0 ),
-			  'WEIBULL'         => array( 302,    4,    1,    0 ),
-			  'SUMXMY2'         => array( 303,    2,    2,    0 ),
-			  'SUMX2MY2'        => array( 304,    2,    2,    0 ),
-			  'SUMX2PY2'        => array( 305,    2,    2,    0 ),
-			  'CHITEST'         => array( 306,    2,    2,    0 ),
-			  'CORREL'          => array( 307,    2,    2,    0 ),
-			  'COVAR'           => array( 308,    2,    2,    0 ),
-			  'FORECAST'        => array( 309,    3,    2,    0 ),
-			  'FTEST'           => array( 310,    2,    2,    0 ),
-			  'INTERCEPT'       => array( 311,    2,    2,    0 ),
-			  'PEARSON'         => array( 312,    2,    2,    0 ),
-			  'RSQ'             => array( 313,    2,    2,    0 ),
-			  'STEYX'           => array( 314,    2,    2,    0 ),
-			  'SLOPE'           => array( 315,    2,    2,    0 ),
-			  'TTEST'           => array( 316,    4,    2,    0 ),
-			  'PROB'            => array( 317,   -1,    2,    0 ),
-			  'DEVSQ'           => array( 318,   -1,    0,    0 ),
-			  'GEOMEAN'         => array( 319,   -1,    0,    0 ),
-			  'HARMEAN'         => array( 320,   -1,    0,    0 ),
-			  'SUMSQ'           => array( 321,   -1,    0,    0 ),
-			  'KURT'            => array( 322,   -1,    0,    0 ),
-			  'SKEW'            => array( 323,   -1,    0,    0 ),
-			  'ZTEST'           => array( 324,   -1,    0,    0 ),
-			  'LARGE'           => array( 325,    2,    0,    0 ),
-			  'SMALL'           => array( 326,    2,    0,    0 ),
-			  'QUARTILE'        => array( 327,    2,    0,    0 ),
-			  'PERCENTILE'      => array( 328,    2,    0,    0 ),
-			  'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
-			  'MODE'            => array( 330,   -1,    2,    0 ),
-			  'TRIMMEAN'        => array( 331,    2,    0,    0 ),
-			  'TINV'            => array( 332,    2,    1,    0 ),
-			  'CONCATENATE'     => array( 336,   -1,    1,    0 ),
-			  'POWER'           => array( 337,    2,    1,    0 ),
-			  'RADIANS'         => array( 342,    1,    1,    0 ),
-			  'DEGREES'         => array( 343,    1,    1,    0 ),
-			  'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
-			  'SUMIF'           => array( 345,   -1,    0,    0 ),
-			  'COUNTIF'         => array( 346,    2,    0,    0 ),
-			  'COUNTBLANK'      => array( 347,    1,    0,    0 ),
-			  'ISPMT'           => array( 350,    4,    1,    0 ),
-			  'DATEDIF'         => array( 351,    3,    1,    0 ),
-			  'DATESTRING'      => array( 352,    1,    1,    0 ),
-			  'NUMBERSTRING'    => array( 353,    2,    1,    0 ),
-			  'ROMAN'           => array( 354,   -1,    1,    0 ),
-			  'GETPIVOTDATA'    => array( 358,   -1,    0,    0 ),
-			  'HYPERLINK'       => array( 359,   -1,    1,    0 ),
-			  'PHONETIC'        => array( 360,    1,    0,    0 ),
-			  'AVERAGEA'        => array( 361,   -1,    0,    0 ),
-			  'MAXA'            => array( 362,   -1,    0,    0 ),
-			  'MINA'            => array( 363,   -1,    0,    0 ),
-			  'STDEVPA'         => array( 364,   -1,    0,    0 ),
-			  'VARPA'           => array( 365,   -1,    0,    0 ),
-			  'STDEVA'          => array( 366,   -1,    0,    0 ),
-			  'VARA'            => array( 367,   -1,    0,    0 ),
-			  'BAHTTEXT'        => array( 368,    1,    0,    0 ),
+			  'COUNT'           => array(0, -1, 0, 0),
+			  'IF'              => array(1, -1, 1, 0),
+			  'ISNA'            => array(2, 1, 1, 0),
+			  'ISERROR'         => array(3, 1, 1, 0),
+			  'SUM'             => array(4, -1, 0, 0),
+			  'AVERAGE'         => array(5, -1, 0, 0),
+			  'MIN'             => array(6, -1, 0, 0),
+			  'MAX'             => array(7, -1, 0, 0),
+			  'ROW'             => array(8, -1, 0, 0),
+			  'COLUMN'          => array(9, -1, 0, 0),
+			  'NA'              => array(10, 0, 0, 0),
+			  'NPV'             => array(11, -1, 1, 0),
+			  'STDEV'           => array(12, -1, 0, 0),
+			  'DOLLAR'          => array(13, -1, 1, 0),
+			  'FIXED'           => array(14, -1, 1, 0),
+			  'SIN'             => array(15, 1, 1, 0),
+			  'COS'             => array(16, 1, 1, 0),
+			  'TAN'             => array(17, 1, 1, 0),
+			  'ATAN'            => array(18, 1, 1, 0),
+			  'PI'              => array(19, 0, 1, 0),
+			  'SQRT'            => array(20, 1, 1, 0),
+			  'EXP'             => array(21, 1, 1, 0),
+			  'LN'              => array(22, 1, 1, 0),
+			  'LOG10'           => array(23, 1, 1, 0),
+			  'ABS'             => array(24, 1, 1, 0),
+			  'INT'             => array(25, 1, 1, 0),
+			  'SIGN'            => array(26, 1, 1, 0),
+			  'ROUND'           => array(27, 2, 1, 0),
+			  'LOOKUP'          => array(28, -1, 0, 0),
+			  'INDEX'           => array(29, -1, 0, 1),
+			  'REPT'            => array(30, 2, 1, 0),
+			  'MID'             => array(31, 3, 1, 0),
+			  'LEN'             => array(32, 1, 1, 0),
+			  'VALUE'           => array(33, 1, 1, 0),
+			  'TRUE'            => array(34, 0, 1, 0),
+			  'FALSE'           => array(35, 0, 1, 0),
+			  'AND'             => array(36, -1, 0, 0),
+			  'OR'              => array(37, -1, 0, 0),
+			  'NOT'             => array(38, 1, 1, 0),
+			  'MOD'             => array(39, 2, 1, 0),
+			  'DCOUNT'          => array(40, 3, 0, 0),
+			  'DSUM'            => array(41, 3, 0, 0),
+			  'DAVERAGE'        => array(42, 3, 0, 0),
+			  'DMIN'            => array(43, 3, 0, 0),
+			  'DMAX'            => array(44, 3, 0, 0),
+			  'DSTDEV'          => array(45, 3, 0, 0),
+			  'VAR'             => array(46, -1, 0, 0),
+			  'DVAR'            => array(47, 3, 0, 0),
+			  'TEXT'            => array(48, 2, 1, 0),
+			  'LINEST'          => array(49, -1, 0, 0),
+			  'TREND'           => array(50, -1, 0, 0),
+			  'LOGEST'          => array(51, -1, 0, 0),
+			  'GROWTH'          => array(52, -1, 0, 0),
+			  'PV'              => array(56, -1, 1, 0),
+			  'FV'              => array(57, -1, 1, 0),
+			  'NPER'            => array(58, -1, 1, 0),
+			  'PMT'             => array(59, -1, 1, 0),
+			  'RATE'            => array(60, -1, 1, 0),
+			  'MIRR'            => array(61, 3, 0, 0),
+			  'IRR'             => array(62, -1, 0, 0),
+			  'RAND'            => array(63, 0, 1, 1),
+			  'MATCH'           => array(64, -1, 0, 0),
+			  'DATE'            => array(65, 3, 1, 0),
+			  'TIME'            => array(66, 3, 1, 0),
+			  'DAY'             => array(67, 1, 1, 0),
+			  'MONTH'           => array(68, 1, 1, 0),
+			  'YEAR'            => array(69, 1, 1, 0),
+			  'WEEKDAY'         => array(70, -1, 1, 0),
+			  'HOUR'            => array(71, 1, 1, 0),
+			  'MINUTE'          => array(72, 1, 1, 0),
+			  'SECOND'          => array(73, 1, 1, 0),
+			  'NOW'             => array(74, 0, 1, 1),
+			  'AREAS'           => array(75, 1, 0, 1),
+			  'ROWS'            => array(76, 1, 0, 1),
+			  'COLUMNS'         => array(77, 1, 0, 1),
+			  'OFFSET'          => array(78, -1, 0, 1),
+			  'SEARCH'          => array(82, -1, 1, 0),
+			  'TRANSPOSE'       => array(83, 1, 1, 0),
+			  'TYPE'            => array(86, 1, 1, 0),
+			  'ATAN2'           => array(97, 2, 1, 0),
+			  'ASIN'            => array(98, 1, 1, 0),
+			  'ACOS'            => array(99, 1, 1, 0),
+			  'CHOOSE'          => array(100, -1, 1, 0),
+			  'HLOOKUP'         => array(101, -1, 0, 0),
+			  'VLOOKUP'         => array(102, -1, 0, 0),
+			  'ISREF'           => array(105, 1, 0, 0),
+			  'LOG'             => array(109, -1, 1, 0),
+			  'CHAR'            => array(111, 1, 1, 0),
+			  'LOWER'           => array(112, 1, 1, 0),
+			  'UPPER'           => array(113, 1, 1, 0),
+			  'PROPER'          => array(114, 1, 1, 0),
+			  'LEFT'            => array(115, -1, 1, 0),
+			  'RIGHT'           => array(116, -1, 1, 0),
+			  'EXACT'           => array(117, 2, 1, 0),
+			  'TRIM'            => array(118, 1, 1, 0),
+			  'REPLACE'         => array(119, 4, 1, 0),
+			  'SUBSTITUTE'      => array(120, -1, 1, 0),
+			  'CODE'            => array(121, 1, 1, 0),
+			  'FIND'            => array(124, -1, 1, 0),
+			  'CELL'            => array(125, -1, 0, 1),
+			  'ISERR'           => array(126, 1, 1, 0),
+			  'ISTEXT'          => array(127, 1, 1, 0),
+			  'ISNUMBER'        => array(128, 1, 1, 0),
+			  'ISBLANK'         => array(129, 1, 1, 0),
+			  'T'               => array(130, 1, 0, 0),
+			  'N'               => array(131, 1, 0, 0),
+			  'DATEVALUE'       => array(140, 1, 1, 0),
+			  'TIMEVALUE'       => array(141, 1, 1, 0),
+			  'SLN'             => array(142, 3, 1, 0),
+			  'SYD'             => array(143, 4, 1, 0),
+			  'DDB'             => array(144, -1, 1, 0),
+			  'INDIRECT'        => array(148, -1, 1, 1),
+			  'CALL'            => array(150, -1, 1, 0),
+			  'CLEAN'           => array(162, 1, 1, 0),
+			  'MDETERM'         => array(163, 1, 2, 0),
+			  'MINVERSE'        => array(164, 1, 2, 0),
+			  'MMULT'           => array(165, 2, 2, 0),
+			  'IPMT'            => array(167, -1, 1, 0),
+			  'PPMT'            => array(168, -1, 1, 0),
+			  'COUNTA'          => array(169, -1, 0, 0),
+			  'PRODUCT'         => array(183, -1, 0, 0),
+			  'FACT'            => array(184, 1, 1, 0),
+			  'DPRODUCT'        => array(189, 3, 0, 0),
+			  'ISNONTEXT'       => array(190, 1, 1, 0),
+			  'STDEVP'          => array(193, -1, 0, 0),
+			  'VARP'            => array(194, -1, 0, 0),
+			  'DSTDEVP'         => array(195, 3, 0, 0),
+			  'DVARP'           => array(196, 3, 0, 0),
+			  'TRUNC'           => array(197, -1, 1, 0),
+			  'ISLOGICAL'       => array(198, 1, 1, 0),
+			  'DCOUNTA'         => array(199, 3, 0, 0),
+			  'USDOLLAR'        => array(204, -1, 1, 0),
+			  'FINDB'           => array(205, -1, 1, 0),
+			  'SEARCHB'         => array(206, -1, 1, 0),
+			  'REPLACEB'        => array(207, 4, 1, 0),
+			  'LEFTB'           => array(208, -1, 1, 0),
+			  'RIGHTB'          => array(209, -1, 1, 0),
+			  'MIDB'            => array(210, 3, 1, 0),
+			  'LENB'            => array(211, 1, 1, 0),
+			  'ROUNDUP'         => array(212, 2, 1, 0),
+			  'ROUNDDOWN'       => array(213, 2, 1, 0),
+			  'ASC'             => array(214, 1, 1, 0),
+			  'DBCS'            => array(215, 1, 1, 0),
+			  'RANK'            => array(216, -1, 0, 0),
+			  'ADDRESS'         => array(219, -1, 1, 0),
+			  'DAYS360'         => array(220, -1, 1, 0),
+			  'TODAY'           => array(221, 0, 1, 1),
+			  'VDB'             => array(222, -1, 1, 0),
+			  'MEDIAN'          => array(227, -1, 0, 0),
+			  'SUMPRODUCT'      => array(228, -1, 2, 0),
+			  'SINH'            => array(229, 1, 1, 0),
+			  'COSH'            => array(230, 1, 1, 0),
+			  'TANH'            => array(231, 1, 1, 0),
+			  'ASINH'           => array(232, 1, 1, 0),
+			  'ACOSH'           => array(233, 1, 1, 0),
+			  'ATANH'           => array(234, 1, 1, 0),
+			  'DGET'            => array(235, 3, 0, 0),
+			  'INFO'            => array(244, 1, 1, 1),
+			  'DB'              => array(247, -1, 1, 0),
+			  'FREQUENCY'       => array(252, 2, 0, 0),
+			  'ERROR.TYPE'      => array(261, 1, 1, 0),
+			  'REGISTER.ID'     => array(267, -1, 1, 0),
+			  'AVEDEV'          => array(269, -1, 0, 0),
+			  'BETADIST'        => array(270, -1, 1, 0),
+			  'GAMMALN'         => array(271, 1, 1, 0),
+			  'BETAINV'         => array(272, -1, 1, 0),
+			  'BINOMDIST'       => array(273, 4, 1, 0),
+			  'CHIDIST'         => array(274, 2, 1, 0),
+			  'CHIINV'          => array(275, 2, 1, 0),
+			  'COMBIN'          => array(276, 2, 1, 0),
+			  'CONFIDENCE'      => array(277, 3, 1, 0),
+			  'CRITBINOM'       => array(278, 3, 1, 0),
+			  'EVEN'            => array(279, 1, 1, 0),
+			  'EXPONDIST'       => array(280, 3, 1, 0),
+			  'FDIST'           => array(281, 3, 1, 0),
+			  'FINV'            => array(282, 3, 1, 0),
+			  'FISHER'          => array(283, 1, 1, 0),
+			  'FISHERINV'       => array(284, 1, 1, 0),
+			  'FLOOR'           => array(285, 2, 1, 0),
+			  'GAMMADIST'       => array(286, 4, 1, 0),
+			  'GAMMAINV'        => array(287, 3, 1, 0),
+			  'CEILING'         => array(288, 2, 1, 0),
+			  'HYPGEOMDIST'     => array(289, 4, 1, 0),
+			  'LOGNORMDIST'     => array(290, 3, 1, 0),
+			  'LOGINV'          => array(291, 3, 1, 0),
+			  'NEGBINOMDIST'    => array(292, 3, 1, 0),
+			  'NORMDIST'        => array(293, 4, 1, 0),
+			  'NORMSDIST'       => array(294, 1, 1, 0),
+			  'NORMINV'         => array(295, 3, 1, 0),
+			  'NORMSINV'        => array(296, 1, 1, 0),
+			  'STANDARDIZE'     => array(297, 3, 1, 0),
+			  'ODD'             => array(298, 1, 1, 0),
+			  'PERMUT'          => array(299, 2, 1, 0),
+			  'POISSON'         => array(300, 3, 1, 0),
+			  'TDIST'           => array(301, 3, 1, 0),
+			  'WEIBULL'         => array(302, 4, 1, 0),
+			  'SUMXMY2'         => array(303, 2, 2, 0),
+			  'SUMX2MY2'        => array(304, 2, 2, 0),
+			  'SUMX2PY2'        => array(305, 2, 2, 0),
+			  'CHITEST'         => array(306, 2, 2, 0),
+			  'CORREL'          => array(307, 2, 2, 0),
+			  'COVAR'           => array(308, 2, 2, 0),
+			  'FORECAST'        => array(309, 3, 2, 0),
+			  'FTEST'           => array(310, 2, 2, 0),
+			  'INTERCEPT'       => array(311, 2, 2, 0),
+			  'PEARSON'         => array(312, 2, 2, 0),
+			  'RSQ'             => array(313, 2, 2, 0),
+			  'STEYX'           => array(314, 2, 2, 0),
+			  'SLOPE'           => array(315, 2, 2, 0),
+			  'TTEST'           => array(316, 4, 2, 0),
+			  'PROB'            => array(317, -1, 2, 0),
+			  'DEVSQ'           => array(318, -1, 0, 0),
+			  'GEOMEAN'         => array(319, -1, 0, 0),
+			  'HARMEAN'         => array(320, -1, 0, 0),
+			  'SUMSQ'           => array(321, -1, 0, 0),
+			  'KURT'            => array(322, -1, 0, 0),
+			  'SKEW'            => array(323, -1, 0, 0),
+			  'ZTEST'           => array(324, -1, 0, 0),
+			  'LARGE'           => array(325, 2, 0, 0),
+			  'SMALL'           => array(326, 2, 0, 0),
+			  'QUARTILE'        => array(327, 2, 0, 0),
+			  'PERCENTILE'      => array(328, 2, 0, 0),
+			  'PERCENTRANK'     => array(329, -1, 0, 0),
+			  'MODE'            => array(330, -1, 2, 0),
+			  'TRIMMEAN'        => array(331, 2, 0, 0),
+			  'TINV'            => array(332, 2, 1, 0),
+			  'CONCATENATE'     => array(336, -1, 1, 0),
+			  'POWER'           => array(337, 2, 1, 0),
+			  'RADIANS'         => array(342, 1, 1, 0),
+			  'DEGREES'         => array(343, 1, 1, 0),
+			  'SUBTOTAL'        => array(344, -1, 0, 0),
+			  'SUMIF'           => array(345, -1, 0, 0),
+			  'COUNTIF'         => array(346, 2, 0, 0),
+			  'COUNTBLANK'      => array(347, 1, 0, 0),
+			  'ISPMT'           => array(350, 4, 1, 0),
+			  'DATEDIF'         => array(351, 3, 1, 0),
+			  'DATESTRING'      => array(352, 1, 1, 0),
+			  'NUMBERSTRING'    => array(353, 2, 1, 0),
+			  'ROMAN'           => array(354, -1, 1, 0),
+			  'GETPIVOTDATA'    => array(358, -1, 0, 0),
+			  'HYPERLINK'       => array(359, -1, 1, 0),
+			  'PHONETIC'        => array(360, 1, 0, 0),
+			  'AVERAGEA'        => array(361, -1, 0, 0),
+			  'MAXA'            => array(362, -1, 0, 0),
+			  'MINA'            => array(363, -1, 0, 0),
+			  'STDEVPA'         => array(364, -1, 0, 0),
+			  'VARPA'           => array(365, -1, 0, 0),
+			  'STDEVA'          => array(366, -1, 0, 0),
+			  'VARA'            => array(367, -1, 0, 0),
+			  'BAHTTEXT'        => array(368, 1, 0, 0),
 			  );
 	}
 
@@ -521,15 +521,15 @@ 
 			return $this->_convertNumber($token);
 
 		// match references like A1 or $A$1
-		} elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/',$token)) {
+		} elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
 			return $this->_convertRef2d($token);
 
 		// match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
+		} elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
 			return $this->_convertRef3d($token);
 
 		// match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
+		} elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
 			return $this->_convertRef3d($token);
 
 		// match ranges like A1:B2 or $A$1:$B$2
@@ -537,11 +537,11 @@ 
 			return $this->_convertRange2d($token);
 
 		// match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
+		} elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
 			return $this->_convertRange3d($token);
 
 		// match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
+		} elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
 			return $this->_convertRange3d($token);
 
 		// operators (including parentheses)
@@ -601,7 +601,7 @@ 
 			throw new Exception("String is too long");
 		}
 
-		return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
+		return pack('C', $this->ptg['ptgStr']).PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	 */
 	function _convertFunction($token, $num_args)
 	{
-		$args     = $this->_functions[$token][1];
+		$args = $this->_functions[$token][1];
 //		$volatile = $this->_functions[$token][3];
 
 		// Fixed number of args eg. TIME($i,$j,$k).
@@ -635,7 +635,7 @@ 
 	 * @param string	$range	An Excel range in the A1:A2
 	 * @param int		$class
 	 */
-	function _convertRange2d($range, $class=0)
+	function _convertRange2d($range, $class = 0)
 	{
 
 		// TODO: possible class value 0,1,2 check Formula.pm
@@ -662,7 +662,7 @@ 
 			// TODO: use real error codes
 			throw new Exception("Unknown class $class");
 		}
-		return $ptgArea . $row1 . $row2 . $col1. $col2;
+		return $ptgArea.$row1.$row2.$col1.$col2;
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 //			throw new Exception("Unknown class $class");
 //		}
 
-		return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
+		return $ptgArea.$ext_ref.$row1.$row2.$col1.$col2;
 	}
 
 	/**
@@ -769,7 +769,7 @@ 
 //			throw new Exception("Unknown class $class");
 //		}
 
-		return $ptgRef . $ext_ref. $row . $col;
+		return $ptgRef.$ext_ref.$row.$col;
 	}
 
     /**
@@ -908,7 +908,7 @@ 
 	 */
 	function _getSheetIndex($sheet_name)
 	{
-		if (!isset($this->_ext_sheets[$sheet_name])) {
+		if ( ! isset($this->_ext_sheets[$sheet_name])) {
 			return -1;
 		} else {
 			return $this->_ext_sheets[$sheet_name];
@@ -1010,7 +1010,7 @@ 
 	 */
 	function _cellToRowcol($cell)
 	{
-		preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/',$cell,$match);
+		preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match);
 		// return absolute column if there is a $ in the ref
 		$col_rel = empty($match[1]) ? 1 : 0;
 		$col_ref = $match[2];
@@ -1049,7 +1049,7 @@ 
 			}
 
 			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
+				$this->_lookahead = $this->_formula{$i + 1};
 			}
 			$token = '';
 		}
@@ -1058,7 +1058,7 @@ 
 			$token .= $this->_formula{$i};
 
 			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
+				$this->_lookahead = $this->_formula{$i + 1};
 			} else {
 				$this->_lookahead = '';
 			}
@@ -1073,7 +1073,7 @@ 
 			}
 
 			if ($i < ($formula_length - 2)) {
-				$this->_lookahead = $this->_formula{$i+2};
+				$this->_lookahead = $this->_formula{$i + 2};
 			} else { // if we run out of characters _lookahead becomes empty
 				$this->_lookahead = '';
 			}
@@ -1091,7 +1091,7 @@ 
 	 */
 	function _match($token)
 	{
-		switch($token) {
+		switch ($token) {
 			case "+":
 			case "-":
 			case "*":
@@ -1124,54 +1124,54 @@ 
 				break;
 			default:
 				// if it's a reference A1 or $A$1 or $A1 or A$1
-				if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and
-				   !preg_match("/[0-9]/",$this->_lookahead) and
+				if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/', $token) and
+				   ! preg_match("/[0-9]/", $this->_lookahead) and
 				   ($this->_lookahead != ':') and ($this->_lookahead != '.') and
 				   ($this->_lookahead != '!'))
 				{
 					return $token;
 				}
 				// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
+				elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and
+					   ! preg_match("/[0-9]/", $this->_lookahead) and
 					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
 				{
 					return $token;
 				}
 				// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
+				elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and
+					   ! preg_match("/[0-9]/", $this->_lookahead) and
 					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
 				{
 					return $token;
 				}
 				// if it's a range A1:A2 or $A$1:$A$2
 				elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
+					   ! preg_match("/[0-9]/", $this->_lookahead))
 				{
 					return $token;
 				}
 				// If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
+				elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and
+					   ! preg_match("/[0-9]/", $this->_lookahead))
 				{
 					return $token;
 				}
 				// If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
+				elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and
+					   ! preg_match("/[0-9]/", $this->_lookahead))
 				{
 					return $token;
 				}
 				// If it's a number (check that it's not a sheet name or range)
 				elseif (is_numeric($token) and
-						(!is_numeric($token.$this->_lookahead) or ($this->_lookahead == '')) and
+						( ! is_numeric($token.$this->_lookahead) or ($this->_lookahead == '')) and
 						($this->_lookahead != '!') and ($this->_lookahead != ':'))
 				{
 					return $token;
 				}
 				// If it's a string (of maximum 255 characters)
-				elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/",$token) and $this->_lookahead != '"' and (substr_count($token, '"')%2 == 0))
+				elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token) and $this->_lookahead != '"' and (substr_count($token, '"') % 2 == 0))
 				{
 					return $token;
 				}
@@ -1181,13 +1181,13 @@ 
 			        return $token;
 			    }
 				// if it's a function call
-				elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "("))
+				elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i", $token) and ($this->_lookahead == "("))
 				{
 					return $token;
 				}
 				//	It's an argument of some description (e.g. a named range),
 				//		precise nature yet to be determined
-				elseif(substr($token,-1) == ')') {
+				elseif (substr($token, -1) == ')') {
 					return $token;
 				}
 				return '';
@@ -1270,12 +1270,12 @@ 
 		// If it's a string return a string node
 		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $this->_current_token)) {
 			$tmp = str_replace('""', '"', $this->_current_token);
-			if (($tmp == '"') || ($tmp == '')) $tmp = '""';	//	Trap for "" that has been used for an empty string
+			if (($tmp == '"') || ($tmp == '')) $tmp = '""'; //	Trap for "" that has been used for an empty string
 			$result = $this->_createTree($tmp, '', '');
 			$this->_advance();
 			return $result;
         // If it's an error code
-        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
+        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A') {
 		    $result = $this->_createTree($this->_current_token, 'ptgErr', '');
 		    $this->_advance();
 		    return $result;
@@ -1370,38 +1370,38 @@ 
 	function _fact()
 	{
 		if ($this->_current_token == "(") {
-			$this->_advance();         // eat the "("
+			$this->_advance(); // eat the "("
 			$result = $this->_parenthesizedExpression();
 			if ($this->_current_token != ")") {
 				throw new Exception("')' token expected.");
 			}
-			$this->_advance();         // eat the ")"
+			$this->_advance(); // eat the ")"
 			return $result;
 		}
 		// if it's a reference
-		if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$this->_current_token))
+		if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/', $this->_current_token))
 		{
 			$result = $this->_createTree($this->_current_token, '', '');
 			$this->_advance();
 			return $result;
 		}
 		// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
+		elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->_current_token))
 		{
 			$result = $this->_createTree($this->_current_token, '', '');
 			$this->_advance();
 			return $result;
 		}
 		// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
+		elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->_current_token))
 		{
 			$result = $this->_createTree($this->_current_token, '', '');
 			$this->_advance();
 			return $result;
 		}
 		// if it's a range A1:B2 or $A$1:$B$2
-		elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token) or
-				preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token))
+		elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $this->_current_token) or
+				preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $this->_current_token))
 		{
 			// must be an error?
 			$result = $this->_createTree($this->_current_token, '', '');
@@ -1409,7 +1409,7 @@ 
 			return $result;
 		}
 		// If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
+		elseif (preg_match("/^".self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->_current_token))
 		{
 			// must be an error?
 			//$result = $this->_current_token;
@@ -1418,7 +1418,7 @@ 
 			return $result;
 		}
 		// If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
+		elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->_current_token))
 		{
 			// must be an error?
 			//$result = $this->_current_token;
@@ -1429,7 +1429,7 @@ 
 		// If it's a number or a percent
 		elseif (is_numeric($this->_current_token))
 		{
-		    if($this->_lookahead == '%'){
+		    if ($this->_lookahead == '%') {
 		        $result = $this->_createTree('ptgPercent', $this->_current_token, '');
 		    } else {
 		        $result = $this->_createTree($this->_current_token, '', '');
@@ -1438,7 +1438,7 @@ 
 		    return $result;
 		}
 		// if it's a function call
-		elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token))
+		elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i", $this->_current_token))
 		{
 			$result = $this->_func();
 			return $result;
@@ -1461,14 +1461,14 @@ 
 		$function = strtoupper($this->_current_token);
 		$result   = ''; // initialize result
 		$this->_advance();
-		$this->_advance();         // eat the "("
+		$this->_advance(); // eat the "("
 		while ($this->_current_token != ')') {
 		/**/
 			if ($num_args > 0) {
 				if ($this->_current_token == "," or
 					$this->_current_token == ";")
 				{
-					$this->_advance();  // eat the "," or ";"
+					$this->_advance(); // eat the "," or ";"
 				} else {
 					throw new Exception("Syntax error: comma expected in ".
 									  "function $function, arg #{$num_args}");
@@ -1481,7 +1481,7 @@ 
 			}
 			++$num_args;
 		}
-		if (!isset($this->_functions[$function])) {
+		if ( ! isset($this->_functions[$function])) {
 			throw new Exception("Function $function() doesn't exist");
 		}
 		$args = $this->_functions[$function][1];
@@ -1491,7 +1491,7 @@ 
 		}
 
 		$result = $this->_createTree($function, $result, $num_args);
-		$this->_advance();         // eat the ")"
+		$this->_advance(); // eat the ")"
 		return $result;
 	}
 
@@ -1559,11 +1559,11 @@ 
 			$polish .= $converted_tree;
 		}
 		// if it's a function convert it here (so we can set it's arguments)
-		if (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/",$tree['value']) and
-			!preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/',$tree['value']) and
-			!preg_match("/^[A-Ia-i]?[A-Za-z](\d+)\.\.[A-Ia-i]?[A-Za-z](\d+)$/",$tree['value']) and
-			!is_numeric($tree['value']) and
-			!isset($this->ptg[$tree['value']]))
+		if (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/", $tree['value']) and
+			! preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) and
+			! preg_match("/^[A-Ia-i]?[A-Za-z](\d+)\.\.[A-Ia-i]?[A-Za-z](\d+)$/", $tree['value']) and
+			! is_numeric($tree['value']) and
+			! isset($this->ptg[$tree['value']]))
 		{
 			// left subtree for a function is always an array.
 			if ($tree['left'] != '') {

Braces +4 added lines, -1 removed lines

@@ -1270,7 +1270,10 @@
 		// If it's a string return a string node
 		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $this->_current_token)) {
 			$tmp = str_replace('""', '"', $this->_current_token);
-			if (($tmp == '"') || ($tmp == '')) $tmp = '""';	//	Trap for "" that has been used for an empty string
+			if (($tmp == '"') || ($tmp == '')) {
+				$tmp = '""';
+			}
+			//	Trap for "" that has been used for an empty string
 			$result = $this->_createTree($tmp, '', '');
 			$this->_advance();
 			return $result;

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php

Doc Comments +5 added lines, -2 removed lines

@@ -198,7 +198,9 @@ 
 	 * @param int		&$str_unique	Total number of unique strings
 	 * @param array		&$str_table		String Table
 	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
+	 * @param PHPExcel_Writer_Excel5_Parser		$parser			The formula parser created for the Workbook
+	 * @param integer $str_total
+	 * @param integer $str_unique
 	 */
 	public function __construct(PHPExcel $phpExcel = null,
 								&$str_total, &$str_unique, &$str_table, &$colors,
@@ -248,6 +250,7 @@ 
 	 *
 	 * @param PHPExcel_Style
 	 * @param boolean Is it a style XF?
+	 * @param PHPExcel_Style $style
 	 * @return int Index to XF record
 	 */
 	public function addXfWriter($style, $isStyleXf = false)
@@ -788,7 +791,7 @@ 
 	 *
 	 * @param	string		$name			The name in UTF-8
 	 * @param	string		$formulaData	The binary formula data
-	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
+	 * @param	integer		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
 	 * @param	boolean		$isBuiltIn		Built-in name?
 	 * @return	string	Complete binary record data
 	 */

Spacing +117 added lines, -117 removed lines

@@ -202,7 +202,7 @@ 
 	 */
 	public function __construct(PHPExcel $phpExcel = null,
 								&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser )
+								$parser)
 	{
 		// It needs to call its parent's constructor explicitly
 		parent::__construct();
@@ -229,11 +229,11 @@ 
 		for ($i = 0; $i < $countSheets; ++$i) {
 			$phpSheet = $phpExcel->getSheet($i);
 
-			$this->_parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
+			$this->_parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
 
 			$supbook_index = 0x00;
 			$ref = pack('vvv', $supbook_index, $i, $i);
-			$this->_parser->_references[] = $ref;  // Register reference with parser
+			$this->_parser->_references[] = $ref; // Register reference with parser
 
 			// Sheet tab colors?
 			if ($phpSheet->isTabColorSet()) {
@@ -303,7 +303,7 @@ 
 	public function _addFont(PHPExcel_Style_Font $font)
 	{
 		$fontHashCode = $font->getHashCode();
-		if(isset($this->_addedFonts[$fontHashCode])){
+		if (isset($this->_addedFonts[$fontHashCode])) {
 			$fontIndex = $this->_addedFonts[$fontHashCode];
 		} else {
 			$countFonts = count($this->_fontWriters);
@@ -324,7 +324,7 @@ 
 	 * @return int Color index
 	 */
 	private function _addColor($rgb) {
-		if (!isset($this->_colors[$rgb])) {
+		if ( ! isset($this->_colors[$rgb])) {
 			if (count($this->_colors) < 57) {
 				// then we add a custom color altering the palette
 				$colorIndex = 8 + count($this->_colors);
@@ -478,7 +478,7 @@ 
 	 */
 	function _calcSheetOffsets()
 	{
-		$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
+		$boundsheet_length = 10; // fixed length for a BOUNDSHEET record
 
 		// size of Workbook globals part 1 + 3
 		$offset            = $this->_datasize;
@@ -661,7 +661,7 @@ 
 				// Create absolute coordinate
 				$range = PHPExcel_Cell::splitRange($namedRange->getRange());
 				for ($i = 0; $i < count($range); $i++) {
-					$range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
+					$range[$i][0] = '\''.str_replace("'", "''", $namedRange->getWorksheet()->getTitle()).'\'!'.PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
 					if (isset($range[$i][1])) {
 						$range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
 					}
@@ -675,7 +675,7 @@ 
 
 					// make sure tRef3d is of type tRef3dR (0x3A)
 					if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
-						$formulaData = "\x3A" . substr($formulaData, 1);
+						$formulaData = "\x3A".substr($formulaData, 1);
 					}
 
 					if ($namedRange->getLocalOnly()) {
@@ -687,7 +687,7 @@ 
 					}
 					$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
 
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					// do nothing
 				}
 			}
@@ -810,12 +810,12 @@ 
 
 		// combine the parts
 		$data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
-			. $name . $formulaData;
+			. $name.$formulaData;
 		$length = strlen($data);
 
 		$header = pack('vv', $record, $length);
 
-		return $header . $data;
+		return $header.$data;
 	}
 
 	/**
@@ -823,14 +823,14 @@ 
 	 */
 	private function _writeCodepage()
 	{
-		$record          = 0x0042;             // Record identifier
-		$length          = 0x0002;             // Number of bytes to follow
-		$cv              = $this->_codepage;   // The code page
+		$record          = 0x0042; // Record identifier
+		$length          = 0x0002; // Number of bytes to follow
+		$cv              = $this->_codepage; // The code page
 
 		$header          = pack('vv', $record, $length);
-		$data            = pack('v',  $cv);
+		$data            = pack('v', $cv);
 
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -838,31 +838,31 @@ 
 	 */
 	private function _writeWindow1()
 	{
-		$record    = 0x003D;                 // Record identifier
-		$length    = 0x0012;                 // Number of bytes to follow
+		$record    = 0x003D; // Record identifier
+		$length    = 0x0012; // Number of bytes to follow
 
-		$xWn       = 0x0000;                 // Horizontal position of window
-		$yWn       = 0x0000;                 // Vertical position of window
-		$dxWn      = 0x25BC;                 // Width of window
-		$dyWn      = 0x1572;                 // Height of window
+		$xWn       = 0x0000; // Horizontal position of window
+		$yWn       = 0x0000; // Vertical position of window
+		$dxWn      = 0x25BC; // Width of window
+		$dyWn      = 0x1572; // Height of window
 
-		$grbit     = 0x0038;                 // Option flags
+		$grbit     = 0x0038; // Option flags
 
 		// not supported by PHPExcel, so there is only one selected sheet, the active
-		$ctabsel   = 1;       // Number of workbook tabs selected
+		$ctabsel   = 1; // Number of workbook tabs selected
 
-		$wTabRatio = 0x0258;                 // Tab to scrollbar ratio
+		$wTabRatio = 0x0258; // Tab to scrollbar ratio
 
 		// not supported by PHPExcel, set to 0
-		$itabFirst = 0;     // 1st displayed worksheet
-		$itabCur   = $this->_phpExcel->getActiveSheetIndex();    // Active worksheet
+		$itabFirst = 0; // 1st displayed worksheet
+		$itabCur   = $this->_phpExcel->getActiveSheetIndex(); // Active worksheet
 
-		$header    = pack("vv",        $record, $length);
+		$header    = pack("vv", $record, $length);
 		$data      = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn,
 									   $grbit,
 									   $itabCur, $itabFirst,
 									   $ctabsel, $wTabRatio);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -874,7 +874,7 @@ 
 	private function _writeBoundsheet($sheet, $offset)
 	{
 		$sheetname = $sheet->getTitle();
-		$record    = 0x0085;                    // Record identifier
+		$record    = 0x0085; // Record identifier
 
 		// sheet state
 		switch ($sheet->getSheetState()) {
@@ -887,14 +887,14 @@ 
 		// sheet type
 		$st = 0x00;
 
-		$grbit     = 0x0000;                    // Visibility and sheet type
+		$grbit     = 0x0000; // Visibility and sheet type
 
 		$data      = pack("VCC", $offset, $ss, $st);
 		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
 
 		$length = strlen($data);
-		$header = pack("vv",  $record, $length);
-		$this->_append($header . $data);
+		$header = pack("vv", $record, $length);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -902,12 +902,12 @@ 
 	 */
 	private function _writeSupbookInternal()
 	{
-		$record    = 0x01AE;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
+		$record    = 0x01AE; // Record identifier
+		$length    = 0x0004; // Bytes to follow
 
 		$header    = pack("vv", $record, $length);
 		$data      = pack("vv", $this->_phpExcel->getSheetCount(), 0x0401);
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -918,16 +918,16 @@ 
 	private function _writeExternsheetBiff8()
 	{
 		$total_references = count($this->_parser->_references);
-		$record   = 0x0017;                     // Record identifier
-		$length   = 2 + 6 * $total_references;  // Number of bytes to follow
+		$record   = 0x0017; // Record identifier
+		$length   = 2 + 6 * $total_references; // Number of bytes to follow
 
-		$supbook_index = 0;           // FIXME: only using internal SUPBOOK record
-		$header           = pack("vv",  $record, $length);
+		$supbook_index = 0; // FIXME: only using internal SUPBOOK record
+		$header           = pack("vv", $record, $length);
 		$data             = pack('v', $total_references);
 		for ($i = 0; $i < $total_references; ++$i) {
 			$data .= $this->_parser->_references[$i];
 		}
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -935,16 +935,16 @@ 
 	 */
 	private function _writeStyle()
 	{
-		$record    = 0x0293;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
+		$record    = 0x0293; // Record identifier
+		$length    = 0x0004; // Bytes to follow
 
-		$ixfe      = 0x8000;  // Index to cell style XF
-		$BuiltIn   = 0x00;     // Built-in style
-		$iLevel    = 0xff;     // Outline style level
+		$ixfe      = 0x8000; // Index to cell style XF
+		$BuiltIn   = 0x00; // Built-in style
+		$iLevel    = 0xff; // Outline style level
 
-		$header    = pack("vv",  $record, $length);
+		$header    = pack("vv", $record, $length);
 		$data      = pack("vCC", $ixfe, $BuiltIn, $iLevel);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -955,15 +955,15 @@ 
 	 */
 	private function _writeNumFormat($format, $ifmt)
 	{
-		$record    = 0x041E;                      // Record identifier
+		$record    = 0x041E; // Record identifier
 
 		$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
-		$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
+		$length    = 2 + strlen($numberFormatString); // Number of bytes to follow
 
 
 		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $ifmt) .  $numberFormatString;
-		$this->_append($header . $data);
+		$data      = pack("v", $ifmt).$numberFormatString;
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -971,15 +971,15 @@ 
 	 */
 	private function _writeDatemode()
 	{
-		$record    = 0x0022;         // Record identifier
-		$length    = 0x0002;         // Bytes to follow
+		$record    = 0x0022; // Record identifier
+		$length    = 0x0002; // Bytes to follow
 
 		$f1904     = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) ?
-			1 : 0;   // Flag for 1904 date system
+			1 : 0; // Flag for 1904 date system
 
 		$header    = pack("vv", $record, $length);
 		$data      = pack("v", $f1904);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -996,12 +996,12 @@ 
 	 */
 	private function _writeExterncount($cxals)
 	{
-		$record   = 0x0016;          // Record identifier
-		$length   = 0x0002;          // Number of bytes to follow
+		$record   = 0x0016; // Record identifier
+		$length   = 0x0002; // Number of bytes to follow
 
 		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $cxals);
-		$this->_append($header . $data);
+		$data     = pack("v", $cxals);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1015,15 +1015,15 @@ 
 	 */
 	private function _writeExternsheet($sheetname)
 	{
-		$record      = 0x0017;                     // Record identifier
-		$length      = 0x02 + strlen($sheetname);  // Number of bytes to follow
+		$record      = 0x0017; // Record identifier
+		$length      = 0x02 + strlen($sheetname); // Number of bytes to follow
 
-		$cch         = strlen($sheetname);         // Length of sheet name
-		$rgch        = 0x03;                       // Filename encoding
+		$cch         = strlen($sheetname); // Length of sheet name
+		$rgch        = 0x03; // Filename encoding
 
-		$header      = pack("vv",  $record, $length);
+		$header      = pack("vv", $record, $length);
 		$data        = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
+		$this->_append($header.$data.$sheetname);
 	}
 
 	/**
@@ -1039,23 +1039,23 @@ 
 	 */
 	private function _writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
 	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x0024;       // Number of bytes to follow
-
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x0015;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
+		$record          = 0x0018; // Record identifier
+		$length          = 0x0024; // Number of bytes to follow
+
+		$grbit           = 0x0020; // Option flags
+		$chKey           = 0x00; // Keyboard shortcut
+		$cch             = 0x01; // Length of text name
+		$cce             = 0x0015; // Length of text definition
+		$ixals           = $index + 1; // Sheet index
+		$itab            = $ixals; // Equal to ixals
+		$cchCustMenu     = 0x00; // Length of cust menu text
+		$cchDescription  = 0x00; // Length of description text
+		$cchHelptopic    = 0x00; // Length of help topic text
+		$cchStatustext   = 0x00; // Length of status bar text
+		$rgch            = $type; // Built-in name type
 
 		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
+		$unknown04       = 0xffff - $index;
 		$unknown05       = 0x0000;
 		$unknown06       = 0x0000;
 		$unknown07       = 0x1087;
@@ -1085,7 +1085,7 @@ 
 		$data              .= pack("v", $rowmax);
 		$data              .= pack("C", $colmin);
 		$data              .= pack("C", $colmax);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1103,30 +1103,30 @@ 
 	 */
 	private function _writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
 	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x003d;       // Number of bytes to follow
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x002e;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
+		$record          = 0x0018; // Record identifier
+		$length          = 0x003d; // Number of bytes to follow
+		$grbit           = 0x0020; // Option flags
+		$chKey           = 0x00; // Keyboard shortcut
+		$cch             = 0x01; // Length of text name
+		$cce             = 0x002e; // Length of text definition
+		$ixals           = $index + 1; // Sheet index
+		$itab            = $ixals; // Equal to ixals
+		$cchCustMenu     = 0x00; // Length of cust menu text
+		$cchDescription  = 0x00; // Length of description text
+		$cchHelptopic    = 0x00; // Length of help topic text
+		$cchStatustext   = 0x00; // Length of status bar text
+		$rgch            = $type; // Built-in name type
 
 		$unknown01       = 0x29;
 		$unknown02       = 0x002b;
 		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
+		$unknown04       = 0xffff - $index;
 		$unknown05       = 0x0000;
 		$unknown06       = 0x0000;
 		$unknown07       = 0x1087;
 		$unknown08       = 0x8008;
 
-		$header             = pack("vv",  $record, $length);
+		$header             = pack("vv", $record, $length);
 		$data               = pack("v", $grbit);
 		$data              .= pack("C", $chKey);
 		$data              .= pack("C", $cch);
@@ -1168,7 +1168,7 @@ 
 		$data              .= pack("C", 0xff);
 		// End of data
 		$data              .= pack("C", 0x10);
-		$this->_append($header . $data);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1178,14 +1178,14 @@ 
 	 */
 	private function _writeCountry()
 	{
-		$record          = 0x008C;    // Record identifier
-		$length          = 4;         // Number of bytes to follow
+		$record          = 0x008C; // Record identifier
+		$length          = 4; // Number of bytes to follow
 
-		$header = pack('vv',  $record, $length);
+		$header = pack('vv', $record, $length);
 		/* using the same country code always for simplicity */
 		$data = pack('vv', $this->_country_code, $this->_country_code);
 		//$this->_append($header . $data);
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -1195,15 +1195,15 @@ 
 	 */
 	private function _writeRecalcId()
 	{
-		$record = 0x01C1;    // Record identifier
-		$length = 8;         // Number of bytes to follow
+		$record = 0x01C1; // Record identifier
+		$length = 8; // Number of bytes to follow
 
-		$header = pack('vv',  $record, $length);
+		$header = pack('vv', $record, $length);
 
 		// by inspection of real Excel files, MS Office Excel 2007 writes this
 		$data = pack('VV', 0x000001C1, 0x00001E667);
 
-		return $this->writeData($header . $data);
+		return $this->writeData($header.$data);
 	}
 
 	/**
@@ -1213,20 +1213,20 @@ 
 	{
 		$aref            = $this->_palette;
 
-		$record          = 0x0092;                 // Record identifier
-		$length          = 2 + 4 * count($aref);   // Number of bytes to follow
-		$ccv             =         count($aref);   // Number of RGB values to follow
-		$data = '';                                // The RGB data
+		$record          = 0x0092; // Record identifier
+		$length          = 2 + 4 * count($aref); // Number of bytes to follow
+		$ccv             = count($aref); // Number of RGB values to follow
+		$data = ''; // The RGB data
 
 		// Pack the RGB data
 		foreach ($aref as $color) {
 			foreach ($color as $byte) {
-				$data .= pack("C",$byte);
+				$data .= pack("C", $byte);
 			}
 		}
 
-		$header = pack("vvv",  $record, $length, $ccv);
-		$this->_append($header . $data);
+		$header = pack("vvv", $record, $length, $ccv);
+		$this->_append($header.$data);
 	}
 
 	/**
@@ -1318,7 +1318,7 @@ 
 						$effective_space_remaining = $space_remaining;
 
 						// for uncompressed strings, sometimes effective space remaining is reduced by 1
-						if ( $encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1 ) {
+						if ($encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1) {
 							--$effective_space_remaining;
 						}
 
@@ -1348,7 +1348,7 @@ 
 			$record = ($i == 0) ? 0x00FC : 0x003C;
 
 			$header = pack("vv", $record, strlen($recordData));
-			$data = $header . $recordData;
+			$data = $header.$recordData;
 
 			$chunk .= $this->writeData($data);
 		}
@@ -1368,9 +1368,9 @@ 
 
 			$record = 0x00EB;
 			$length = strlen($data);
-			$header = pack("vv",  $record, $length);
+			$header = pack("vv", $record, $length);
 
-			return $this->writeData($header . $data);
+			return $this->writeData($header.$data);
 
 		} else {
 			return '';