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

Added missing variables

This commit is contained in:
Gemorroj 2016-12-04 15:58:21 +09:00 committed by Adrien Crivelli
parent b964788d5c
commit 48a6e86adc
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PhpSpreadsheet/Writer/Xls/Worksheet.php
View File

@ -189,6 +189,16 @@ class Worksheet extends BIFFwriter
*/ */
public $fontHashIndex; public $fontHashIndex;
/**
* @var bool
*/
private $preCalculateFormulas;
/**
* @var int
*/
private $printHeaders;
/** /**
* Constructor * Constructor
* *
@ -206,7 +216,7 @@ class Worksheet extends BIFFwriter
// It needs to call its parent's constructor explicitly // It needs to call its parent's constructor explicitly
parent::__construct(); parent::__construct();
$this->_preCalculateFormulas = $preCalculateFormulas; $this->preCalculateFormulas = $preCalculateFormulas;
$this->stringTotal = &$str_total; $this->stringTotal = &$str_total;
$this->stringUnique = &$str_unique; $this->stringUnique = &$str_unique;
$this->stringTable = &$str_table; $this->stringTable = &$str_table;
@ -220,7 +230,7 @@ class Worksheet extends BIFFwriter
$this->selection = [0, 0, 0, 0]; $this->selection = [0, 0, 0, 0];
$this->activePane = 3; $this->activePane = 3;
$this->_print_headers = 0; $this->printHeaders = 0;
$this->outlineStyle = 0; $this->outlineStyle = 0;
$this->outlineBelow = 1; $this->outlineBelow = 1;
@ -421,7 +431,7 @@ class Worksheet extends BIFFwriter
break; break;
case \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA: case \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA:
$calculatedValue = $this->_preCalculateFormulas ? $calculatedValue = $this->preCalculateFormulas ?
$cell->getCalculatedValue() : null; $cell->getCalculatedValue() : null;
$this->writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue); $this->writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
break; break;
@ -564,7 +574,7 @@ class Worksheet extends BIFFwriter
*/ */
public function printRowColHeaders($print = 1) public function printRowColHeaders($print = 1)
{ {
$this->_print_headers = $print; $this->printHeaders = $print;
} }
/** /**
@ -1972,7 +1982,7 @@ class Worksheet extends BIFFwriter
$record = 0x002a; // Record identifier $record = 0x002a; // Record identifier
$length = 0x0002; // Bytes to follow $length = 0x0002; // Bytes to follow
$fPrintRwCol = $this->_print_headers; // Boolean flag $fPrintRwCol = $this->printHeaders; // Boolean flag
$header = pack('vv', $record, $length); $header = pack('vv', $record, $length);
$data = pack('v', $fPrintRwCol); $data = pack('v', $fPrintRwCol);