alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'psr2' into develop

This commit is contained in:
MarkBaker 2015-05-23 18:37:44 +01:00
parent 8f1be4f4de 98a087afb4
commit 217ef4297c
3 changed files with 236 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Writer/Excel5.php
View File

@ -149,15 +149,15 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
// add fonts from rich text eleemnts // add fonts from rich text eleemnts
for ($i = 0; $i < $countSheets; ++$i) { for ($i = 0; $i < $countSheets; ++$i) {
foreach ($this->writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) { foreach ($this->writerWorksheets[$i]->phpSheet->getCellCollection() as $cellID) {
$cell = $this->writerWorksheets[$i]->_phpSheet->getCell($cellID); $cell = $this->writerWorksheets[$i]->phpSheet->getCell($cellID);
$cVal = $cell->getValue(); $cVal = $cell->getValue();
if ($cVal instanceof PHPExcel_RichText) { if ($cVal instanceof PHPExcel_RichText) {
$elements = $cVal->getRichTextElements(); $elements = $cVal->getRichTextElements();
foreach ($elements as $element) { foreach ($elements as $element) {
if ($element instanceof PHPExcel_RichText_Run) { if ($element instanceof PHPExcel_RichText_Run) {
$font = $element->getFont(); $font = $element->getFont();
$this->writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font); $this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
} }
} }
} }

16
Classes/PHPExcel/Writer/Excel5/Workbook.php
View File

@ -153,21 +153,21 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
* *
* @var int * @var int
*/ */
private $strTotal; private $stringTotal;
/** /**
* Number of unique shared strings in workbook * Number of unique shared strings in workbook
* *
* @var int * @var int
*/ */
private $strUnique; private $stringUnique;
/** /**
* Array of unique shared strings in workbook * Array of unique shared strings in workbook
* *
* @var array * @var array
*/ */
private $strTable; private $stringTable;
/** /**
* Color cache * Color cache
@ -202,9 +202,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$this->palette = array(); $this->palette = array();
$this->countryCode = -1; $this->countryCode = -1;
$this->strTotal = &$str_total; $this->stringTotal = &$str_total;
$this->strUnique = &$str_unique; $this->stringUnique = &$str_unique;
$this->strTable = &$str_table; $this->stringTable = &$str_table;
$this->colors = &$colors; $this->colors = &$colors;
$this->setPaletteXl97(); $this->setPaletteXl97();
@ -1300,10 +1300,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$recordDatas = array(); $recordDatas = array();
// start SST record data block with total number of strings, total number of unique strings // start SST record data block with total number of strings, total number of unique strings
$recordData = pack("VV", $this->strTotal, $this->strUnique); $recordData = pack("VV", $this->stringTotal, $this->stringUnique);
// loop through all (unique) strings in shared strings table // loop through all (unique) strings in shared strings table
foreach (array_keys($this->strTable) as $string) { foreach (array_keys($this->stringTable) as $string) {
// here $string is a BIFF8 encoded string // here $string is a BIFF8 encoded string
// length = character count // length = character count

466
Classes/PHPExcel/Writer/Excel5/Worksheet.php
View File

File diff suppressed because it is too large Load Diff