This should be the last of the writer changes for psr-2, leaving just trendlines before we've done as much as we can without breaking backward compatibility
This commit is contained in:
parent
44f049a0a5
commit
98a087afb4
|
@ -149,15 +149,15 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
|
|||
|
||||
// add fonts from rich text eleemnts
|
||||
for ($i = 0; $i < $countSheets; ++$i) {
|
||||
foreach ($this->writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) {
|
||||
$cell = $this->writerWorksheets[$i]->_phpSheet->getCell($cellID);
|
||||
foreach ($this->writerWorksheets[$i]->phpSheet->getCellCollection() as $cellID) {
|
||||
$cell = $this->writerWorksheets[$i]->phpSheet->getCell($cellID);
|
||||
$cVal = $cell->getValue();
|
||||
if ($cVal instanceof PHPExcel_RichText) {
|
||||
$elements = $cVal->getRichTextElements();
|
||||
foreach ($elements as $element) {
|
||||
if ($element instanceof PHPExcel_RichText_Run) {
|
||||
$font = $element->getFont();
|
||||
$this->writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
|
||||
$this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -153,21 +153,21 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
|
|||
*
|
||||
* @var int
|
||||
*/
|
||||
private $strTotal;
|
||||
private $stringTotal;
|
||||
|
||||
/**
|
||||
* Number of unique shared strings in workbook
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $strUnique;
|
||||
private $stringUnique;
|
||||
|
||||
/**
|
||||
* Array of unique shared strings in workbook
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $strTable;
|
||||
private $stringTable;
|
||||
|
||||
/**
|
||||
* Color cache
|
||||
|
@ -202,9 +202,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
|
|||
$this->palette = array();
|
||||
$this->countryCode = -1;
|
||||
|
||||
$this->strTotal = &$str_total;
|
||||
$this->strUnique = &$str_unique;
|
||||
$this->strTable = &$str_table;
|
||||
$this->stringTotal = &$str_total;
|
||||
$this->stringUnique = &$str_unique;
|
||||
$this->stringTable = &$str_table;
|
||||
$this->colors = &$colors;
|
||||
$this->setPaletteXl97();
|
||||
|
||||
|
@ -1300,10 +1300,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
|
|||
$recordDatas = array();
|
||||
|
||||
// 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
|
||||
foreach (array_keys($this->strTable) as $string) {
|
||||
foreach (array_keys($this->stringTable) as $string) {
|
||||
// here $string is a BIFF8 encoded string
|
||||
|
||||
// length = character count
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue