Update library PHPExcel to version 1.7.3
This commit is contained in:
@@ -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
|
||||
@@ -22,39 +22,10 @@
|
||||
* @package PHPExcel_RichText
|
||||
* @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 1.7.2, 2010-01-11
|
||||
* @version 1.7.3, 2010-05-17
|
||||
*/
|
||||
|
||||
|
||||
/** PHPExcel root directory */
|
||||
if (!defined('PHPEXCEL_ROOT')) {
|
||||
/**
|
||||
* @ignore
|
||||
*/
|
||||
define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
|
||||
}
|
||||
|
||||
/** PHPExcel_IComparable */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/IComparable.php';
|
||||
|
||||
/** PHPExcel_Cell */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/Cell.php';
|
||||
|
||||
/** PHPExcel_Cell_DataType */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/Cell/DataType.php';
|
||||
|
||||
/** PHPExcel_RichText_ITextElement */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/RichText/ITextElement.php';
|
||||
|
||||
/** PHPExcel_RichText_TextElement */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/RichText/TextElement.php';
|
||||
|
||||
/** PHPExcel_RichText_Run */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/RichText/Run.php';
|
||||
|
||||
/** PHPExcel_Style_Font */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/Style/Font.php';
|
||||
|
||||
/**
|
||||
* PHPExcel_RichText
|
||||
*
|
||||
@@ -70,14 +41,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
* @var PHPExcel_RichText_ITextElement[]
|
||||
*/
|
||||
private $_richTextElements;
|
||||
|
||||
/**
|
||||
* Parent cell
|
||||
*
|
||||
* @var PHPExcel_Cell
|
||||
*/
|
||||
private $_parent;
|
||||
|
||||
|
||||
/**
|
||||
* Create a new PHPExcel_RichText instance
|
||||
*
|
||||
@@ -88,24 +52,21 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
{
|
||||
// Initialise variables
|
||||
$this->_richTextElements = array();
|
||||
|
||||
// Set parent?
|
||||
|
||||
// Rich-Text string attached to cell?
|
||||
if (!is_null($pCell)) {
|
||||
// Set parent cell
|
||||
$this->_parent = $pCell;
|
||||
|
||||
// Add cell text and style
|
||||
if ($this->_parent->getValue() != "") {
|
||||
$objRun = new PHPExcel_RichText_Run($this->_parent->getValue());
|
||||
$objRun->setFont(clone $this->_parent->getParent()->getStyle($this->_parent->getCoordinate())->getFont());
|
||||
if ($pCell->getValue() != "") {
|
||||
$objRun = new PHPExcel_RichText_Run($pCell->getValue());
|
||||
$objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
|
||||
$this->addText($objRun);
|
||||
}
|
||||
|
||||
|
||||
// Set parent value
|
||||
$this->_parent->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
|
||||
$pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Add text
|
||||
*
|
||||
@@ -118,7 +79,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
$this->_richTextElements[] = $pText;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create text
|
||||
*
|
||||
@@ -132,7 +93,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
$this->addText($objText);
|
||||
return $objText;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create text run
|
||||
*
|
||||
@@ -146,7 +107,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
$this->addText($objText);
|
||||
return $objText;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get plain text
|
||||
*
|
||||
@@ -156,16 +117,16 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
{
|
||||
// Return value
|
||||
$returnValue = '';
|
||||
|
||||
|
||||
// Loop through all PHPExcel_RichText_ITextElement
|
||||
foreach ($this->_richTextElements as $text) {
|
||||
$returnValue .= $text->getText();
|
||||
}
|
||||
|
||||
|
||||
// Return
|
||||
return $returnValue;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert to string
|
||||
*
|
||||
@@ -174,7 +135,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
public function __toString() {
|
||||
return $this->getPlainText();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get Rich Text elements
|
||||
*
|
||||
@@ -184,7 +145,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
{
|
||||
return $this->_richTextElements;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Rich Text elements
|
||||
*
|
||||
@@ -201,70 +162,30 @@ class PHPExcel_RichText implements PHPExcel_IComparable
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get parent
|
||||
*
|
||||
* @return PHPExcel_Cell
|
||||
*/
|
||||
public function getParent() {
|
||||
return $this->_parent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set parent
|
||||
*
|
||||
* @param PHPExcel_Cell $value
|
||||
* @return PHPExcel_RichText
|
||||
*/
|
||||
public function setParent(PHPExcel_Cell $value) {
|
||||
// Set parent
|
||||
$this->_parent = $value;
|
||||
|
||||
// Set parent value
|
||||
$this->_parent->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
|
||||
|
||||
// Verify style information
|
||||
|
||||
$sheet = $this->_parent->getParent();
|
||||
$cellFont = $sheet->getStyle($this->_parent->getCoordinate())->getFont()->getSharedComponent();
|
||||
foreach ($this->getRichTextElements() as $element) {
|
||||
if (!($element instanceof PHPExcel_RichText_Run)) continue;
|
||||
|
||||
if ($element->getFont()->getHashCode() == $sheet->getDefaultStyle()->getFont()->getHashCode()) {
|
||||
if ($element->getFont()->getHashCode() != $cellFont->getHashCode()) {
|
||||
$element->setFont(clone $cellFont);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get hash code
|
||||
*
|
||||
* @return string Hash code
|
||||
*/
|
||||
*/
|
||||
public function getHashCode() {
|
||||
$hashElements = '';
|
||||
foreach ($this->_richTextElements as $element) {
|
||||
$hashElements .= $element->getHashCode();
|
||||
}
|
||||
|
||||
|
||||
return md5(
|
||||
$hashElements
|
||||
. __CLASS__
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Implement PHP __clone to create a deep clone, not just a shallow copy.
|
||||
*/
|
||||
public function __clone() {
|
||||
$vars = get_object_vars($this);
|
||||
foreach ($vars as $key => $value) {
|
||||
if ($key == '_parent') continue;
|
||||
|
||||
if (is_object($value)) {
|
||||
$this->$key = clone $value;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user