geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-25 18:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

General performance improvements, and specific improvements in the CSV Reader

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@65064 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker
2010-12-09 12:07:50 +00:00
parent 500a8e763e
commit 1fad8bd2dd
23 changed files with 800 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Style/Font.php
+247 -248
View File
@@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
* @package PHPExcel_Style
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
@@ -30,7 +30,7 @@
* PHPExcel_Style_Font
*
* @category PHPExcel
* @package PHPExcel_Style
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Style_Font implements PHPExcel_IComparable
@@ -43,53 +43,60 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
const UNDERLINE_SINGLEACCOUNTING = 'singleAccounting';
/**
* Name
* Font Name
*
* @var string
*/
private $_name;
private $_name = 'Calibri';
/**
* Font Size
*
* @var float
*/
private $_size = 11;
/**
* Bold
*
* @var boolean
*/
private $_bold;
private $_bold = false;
/**
* Italic
*
* @var boolean
*/
private $_italic;
private $_italic = false;
/**
* Superscript
*
* @var boolean
*/
private $_superScript;
private $_superScript = false;
/**
* Subscript
*
* @var boolean
*/
private $_subScript;
private $_subScript = false;
/**
* Underline
*
* @var string
*/
private $_underline;
private $_underline = PHPExcel_Style_Font::UNDERLINE_NONE;
/**
* Strikethrough
*
* @var boolean
*/
private $_strikethrough;
private $_strikethrough = false;
/**
* Foreground color
@@ -120,29 +127,21 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
private $_parent;
/**
* Create a new PHPExcel_Style_Font
*/
public function __construct($isSupervisor = false)
{
// Supervisor?
* Create a new PHPExcel_Style_Font
*/
public function __construct($isSupervisor = false)
{
// Supervisor?
$this->_isSupervisor = $isSupervisor;
// Initialise values
$this->_name = 'Calibri';
$this->_size = 11;
$this->_bold = false;
$this->_italic = false;
$this->_superScript = false;
$this->_subScript = false;
$this->_underline = PHPExcel_Style_Font::UNDERLINE_NONE;
$this->_strikethrough = false;
// Initialise values
$this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
// bind parent if we are a supervisor
if ($isSupervisor) {
$this->_color->bindParent($this, '_color');
}
}
}
/**
* Bind parent. Only used for supervisor
@@ -219,28 +218,28 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
return array('font' => $array);
}
/**
* Apply styles from array
*
* <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
* array(
* 'name' => 'Arial',
* 'bold' => true,
* 'italic' => false,
* 'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
* 'strike' => false,
* 'color' => array(
* 'rgb' => '808080'
* )
* )
* );
* </code>
*
* @param array $pStyles Array containing style information
* @throws Exception
* @return PHPExcel_Style_Font
*/
/**
* Apply styles from array
*
* <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
* array(
* 'name' => 'Arial',
* 'bold' => true,
* 'italic' => false,
* 'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
* 'strike' => false,
* 'color' => array(
* 'rgb' => '808080'
* )
* )
* );
* </code>
*
* @param array $pStyles Array containing style information
* @throws Exception
* @return PHPExcel_Style_Font
*/
public function applyFromArray($pStyles = null) {
if (is_array($pStyles)) {
if ($this->_isSupervisor) {
@@ -280,28 +279,28 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
return $this;
}
/**
* Get Name
*
* @return string
*/
public function getName() {
/**
* Get Name
*
* @return string
*/
public function getName() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getName();
}
return $this->_name;
}
return $this->_name;
}
/**
* Set Name
*
* @param string $pValue
* @return PHPExcel_Style_Font
*/
public function setName($pValue = 'Calibri') {
if ($pValue == '') {
$pValue = 'Calibri';
}
/**
* Set Name
*
* @param string $pValue
* @return PHPExcel_Style_Font
*/
public function setName($pValue = 'Calibri') {
if ($pValue == '') {
$pValue = 'Calibri';
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('name' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -309,30 +308,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_name = $pValue;
}
return $this;
}
}
/**
* Get Size
*
* @return double
*/
public function getSize() {
/**
* Get Size
*
* @return double
*/
public function getSize() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getSize();
}
return $this->_size;
}
return $this->_size;
}
/**
* Set Size
*
* @param double $pValue
* @return PHPExcel_Style_Font
*/
public function setSize($pValue = 10) {
if ($pValue == '') {
$pValue = 10;
}
/**
* Set Size
*
* @param double $pValue
* @return PHPExcel_Style_Font
*/
public function setSize($pValue = 10) {
if ($pValue == '') {
$pValue = 10;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('size' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -340,30 +339,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_size = $pValue;
}
return $this;
}
}
/**
* Get Bold
*
* @return boolean
*/
public function getBold() {
/**
* Get Bold
*
* @return boolean
*/
public function getBold() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getBold();
}
return $this->_bold;
}
return $this->_bold;
}
/**
* Set Bold
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setBold($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
/**
* Set Bold
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setBold($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('bold' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -371,30 +370,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_bold = $pValue;
}
return $this;
}
}
/**
* Get Italic
*
* @return boolean
*/
public function getItalic() {
/**
* Get Italic
*
* @return boolean
*/
public function getItalic() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getItalic();
}
return $this->_italic;
}
return $this->_italic;
}
/**
* Set Italic
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setItalic($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
/**
* Set Italic
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setItalic($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('italic' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -402,30 +401,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_italic = $pValue;
}
return $this;
}
}
/**
* Get SuperScript
*
* @return boolean
*/
public function getSuperScript() {
/**
* Get SuperScript
*
* @return boolean
*/
public function getSuperScript() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getSuperScript();
}
return $this->_superScript;
}
return $this->_superScript;
}
/**
* Set SuperScript
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setSuperScript($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
/**
* Set SuperScript
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setSuperScript($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('superScript' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -434,30 +433,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_subScript = !$pValue;
}
return $this;
}
}
/**
* Get SubScript
*
* @return boolean
*/
public function getSubScript() {
/**
* Get SubScript
*
* @return boolean
*/
public function getSubScript() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getSubScript();
}
return $this->_subScript;
}
return $this->_subScript;
}
/**
* Set SubScript
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setSubScript($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
/**
* Set SubScript
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setSubScript($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('subScript' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -466,30 +465,30 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_superScript = !$pValue;
}
return $this;
}
}
/**
* Get Underline
*
* @return string
*/
public function getUnderline() {
/**
* Get Underline
*
* @return string
*/
public function getUnderline() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getUnderline();
}
return $this->_underline;
}
return $this->_underline;
}
/**
* Set Underline
*
* @param string $pValue PHPExcel_Style_Font underline type
* @return PHPExcel_Style_Font
*/
public function setUnderline($pValue = PHPExcel_Style_Font::UNDERLINE_NONE) {
if ($pValue == '') {
$pValue = PHPExcel_Style_Font::UNDERLINE_NONE;
}
/**
* Set Underline
*
* @param string $pValue PHPExcel_Style_Font underline type
* @return PHPExcel_Style_Font
*/
public function setUnderline($pValue = PHPExcel_Style_Font::UNDERLINE_NONE) {
if ($pValue == '') {
$pValue = PHPExcel_Style_Font::UNDERLINE_NONE;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('underline' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -497,51 +496,51 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_underline = $pValue;
}
return $this;
}
}
/**
* Get Striketrough
*
* @deprecated Use getStrikethrough() instead.
* @return boolean
*/
public function getStriketrough() {
return $this->getStrikethrough();
}
/**
* Get Striketrough
*
* @deprecated Use getStrikethrough() instead.
* @return boolean
*/
public function getStriketrough() {
return $this->getStrikethrough();
}
/**
* Set Striketrough
*
* @deprecated Use setStrikethrough() instead.
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setStriketrough($pValue = false) {
return $this->setStrikethrough($pValue);
}
/**
* Set Striketrough
*
* @deprecated Use setStrikethrough() instead.
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setStriketrough($pValue = false) {
return $this->setStrikethrough($pValue);
}
/**
* Get Strikethrough
*
* @return boolean
*/
public function getStrikethrough() {
/**
* Get Strikethrough
*
* @return boolean
*/
public function getStrikethrough() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getStrikethrough();
}
return $this->_strikethrough;
}
return $this->_strikethrough;
}
/**
* Set Strikethrough
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setStrikethrough($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
/**
* Set Strikethrough
*
* @param boolean $pValue
* @return PHPExcel_Style_Font
*/
public function setStrikethrough($pValue = false) {
if ($pValue == '') {
$pValue = false;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('strike' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -549,25 +548,25 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_strikethrough = $pValue;
}
return $this;
}
}
/**
* Get Color
*
* @return PHPExcel_Style_Color
*/
public function getColor() {
return $this->_color;
}
/**
* Get Color
*
* @return PHPExcel_Style_Color
*/
public function getColor() {
return $this->_color;
}
/**
* Set Color
*
* @param PHPExcel_Style_Color $pValue
* @throws Exception
* @return PHPExcel_Style_Font
*/
public function setColor(PHPExcel_Style_Color $pValue = null) {
/**
* Set Color
*
* @param PHPExcel_Style_Color $pValue
* @throws Exception
* @return PHPExcel_Style_Font
*/
public function setColor(PHPExcel_Style_Color $pValue = null) {
// make sure parameter is a real color and not a supervisor
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
@@ -578,7 +577,7 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
$this->_color = $color;
}
return $this;
}
}
/**
* Get hash code
@@ -589,19 +588,19 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->_name
. $this->_size
. ($this->_bold ? 't' : 'f')
. ($this->_italic ? 't' : 'f')
return md5(
$this->_name
. $this->_size
. ($this->_bold ? 't' : 'f')
. ($this->_italic ? 't' : 'f')
. ($this->_superScript ? 't' : 'f')
. ($this->_subScript ? 't' : 'f')
. $this->_underline
. ($this->_strikethrough ? 't' : 'f')
. $this->_color->getHashCode()
. __CLASS__
);
}
. $this->_underline
. ($this->_strikethrough ? 't' : 'f')
. $this->_color->getHashCode()
. __CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.