General performance improvements, and specific improvements in the CSV Reader

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@65064 2327b42d-5241-43d6-9e2a-de5ac946f064

Classes/PHPExcel/Worksheet/ColumnDimension.php

@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -34,14 +34,14 @@
  * @copyright  Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_ColumnDimension
-{			
+{
 	/**
 	 * Column index
 	 *
 	 * @var int
 	 */
 	private $_columnIndex;
-	
+
 	/**
 	 * Column width
 	 *
@@ -49,35 +49,35 @@ class PHPExcel_Worksheet_ColumnDimension
 	 *
 	 * @var double
 	 */
-	private $_width;
-	
+	private $_width			= -1;
+
 	/**
 	 * Auto size?
 	 *
 	 * @var bool
 	 */
-	private $_autoSize;
-	
+	private $_autoSize		= false;
+
 	/**
 	 * Visible?
 	 *
 	 * @var bool
 	 */
-	private $_visible;
-	
+	private $_visible		= true;
+
 	/**
 	 * Outline level
 	 *
 	 * @var int
 	 */
-	private $_outlineLevel = 0;
-	
+	private $_outlineLevel	= 0;
+
 	/**
 	 * Collapsed
 	 *
 	 * @var bool
 	 */
-	private $_collapsed;
+	private $_collapsed		= false;
 
 	/**
 	 * Index to cellXf
@@ -95,16 +95,11 @@ class PHPExcel_Worksheet_ColumnDimension
     {
     	// Initialise values
     	$this->_columnIndex		= $pIndex;
-    	$this->_width			= -1;
-    	$this->_autoSize		= false;
-    	$this->_visible			= true;
-    	$this->_outlineLevel	= 0;
-    	$this->_collapsed		= false;
 
 		// set default index to cellXf
 		$this->_xfIndex = 0;
     }
-    
+
     /**
      * Get ColumnIndex
      *
@@ -113,7 +108,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getColumnIndex() {
     	return $this->_columnIndex;
     }
-    
+
     /**
      * Set ColumnIndex
      *
@@ -124,7 +119,7 @@ class PHPExcel_Worksheet_ColumnDimension
     	$this->_columnIndex = $pValue;
     	return $this;
     }
-    
+
     /**
      * Get Width
      *
@@ -133,7 +128,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getWidth() {
     	return $this->_width;
     }
-    
+
     /**
      * Set Width
      *
@@ -144,7 +139,7 @@ class PHPExcel_Worksheet_ColumnDimension
     	$this->_width = $pValue;
     	return $this;
     }
-    
+
     /**
      * Get Auto Size
      *
@@ -153,7 +148,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getAutoSize() {
     	return $this->_autoSize;
     }
-    
+
     /**
      * Set Auto Size
      *
@@ -164,7 +159,7 @@ class PHPExcel_Worksheet_ColumnDimension
     	$this->_autoSize = $pValue;
     	return $this;
     }
-    
+
     /**
      * Get Visible
      *
@@ -173,7 +168,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getVisible() {
     	return $this->_visible;
     }
-    
+
     /**
      * Set Visible
      *
@@ -184,7 +179,7 @@ class PHPExcel_Worksheet_ColumnDimension
     	$this->_visible = $pValue;
     	return $this;
     }
-    
+
     /**
      * Get Outline Level
      *
@@ -193,7 +188,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getOutlineLevel() {
     	return $this->_outlineLevel;
     }
-    
+
     /**
      * Set Outline Level
      *
@@ -207,11 +202,11 @@ class PHPExcel_Worksheet_ColumnDimension
     	if ($pValue < 0 || $pValue > 7) {
     		throw new Exception("Outline level must range between 0 and 7.");
     	}
-    	
+
     	$this->_outlineLevel = $pValue;
     	return $this;
     }
-    
+
     /**
      * Get Collapsed
      *
@@ -220,7 +215,7 @@ class PHPExcel_Worksheet_ColumnDimension
     public function getCollapsed() {
     	return $this->_collapsed;
     }
-    
+
     /**
      * Set Collapsed
      *
@@ -231,7 +226,7 @@ class PHPExcel_Worksheet_ColumnDimension
     	$this->_collapsed = $pValue;
     	return $this;
     }
-        
+
 	/**
 	 * Get index to cellXf
 	 *