RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-25 14:56:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge fix to style duplication from the 1.x develop branch

Browse Source
This commit is contained in:
Mark Baker 2013-08-17 13:36:13 +01:00
parent 186302db5d
commit 4bd9df5c81
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/PHPExcel/Style.php
View File

@ -424,7 +424,7 @@ class Style extends Style_Supervisor implements IComparable
$newStyle = clone $style; $newStyle = clone $style;
$newStyle->applyFromArray($pStyles); $newStyle->applyFromArray($pStyles);
if ($workbook->cellXfExists($newStyle)) { if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
// there is already such cell Xf in our collection // there is already such cell Xf in our collection
$newXfIndexes[$oldXfIndex] = $existingStyle->getIndex(); $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
} else { } else {

6
Classes/PHPExcel/Worksheet.php
View File

@ -1478,9 +1478,9 @@ class Worksheet implements IComparable
// Add the style to the workbook if necessary // Add the style to the workbook if necessary
$workbook = $this->_parent; $workbook = $this->_parent;
if ($this->_parent->cellXfExists($pCellStyle)) { if ($existingStyle = $this->_parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
// there is already this cell Xf in our collection // there is already such cell Xf in our collection
$xfIndex = $pCellStyle->getIndex(); $xfIndex = $existingStyle->getIndex();
} else { } else {
// we don't have such a cell Xf, need to add // we don't have such a cell Xf, need to add
$workbook->addCellXf($pCellStyle); $workbook->addCellXf($pCellStyle);