@@ -199,10 +199,12 @@ discard block |
||
199 | 199 | * @param int &$str_unique Total number of unique strings |
200 | 200 | * @param array &$str_table String Table |
201 | 201 | * @param array &$colors Colour Table |
202 | - * @param mixed $parser The formula parser created for the Workbook |
|
202 | + * @param Parser $parser The formula parser created for the Workbook |
|
203 | 203 | * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
204 | 204 | * @param string $phpSheet The worksheet to write |
205 | 205 | * @param \PhpSpreadsheet\Worksheet $phpSheet |
206 | + * @param integer $str_total |
|
207 | + * @param integer $str_unique |
|
206 | 208 | */ |
207 | 209 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
208 | 210 | { |
@@ -611,7 +613,7 @@ discard block |
||
611 | 613 | * @param int $row Zero indexed row |
612 | 614 | * @param int $col Zero indexed column |
613 | 615 | * @param float $num The number to write |
614 | - * @param mixed $xfIndex The optional XF format |
|
616 | + * @param integer $xfIndex The optional XF format |
|
615 | 617 | * @return int |
616 | 618 | */ |
617 | 619 | private function writeNumber($row, $col, $num, $xfIndex) |
@@ -717,7 +719,7 @@ discard block |
||
717 | 719 | * @param int $row Zero indexed row |
718 | 720 | * @param int $col Zero indexed column |
719 | 721 | * @param string $str The string to write |
720 | - * @param mixed $xfIndex The XF format index for the cell |
|
722 | + * @param integer $xfIndex The XF format index for the cell |
|
721 | 723 | * @return int |
722 | 724 | */ |
723 | 725 | private function writeLabelSst($row, $col, $str, $xfIndex) |
@@ -783,7 +785,7 @@ discard block |
||
783 | 785 | * |
784 | 786 | * @param int $row Zero indexed row |
785 | 787 | * @param int $col Zero indexed column |
786 | - * @param mixed $xfIndex The XF format index |
|
788 | + * @param integer $xfIndex The XF format index |
|
787 | 789 | */ |
788 | 790 | public function writeBlank($row, $col, $xfIndex) |
789 | 791 | { |
@@ -830,7 +832,7 @@ discard block |
||
830 | 832 | * @param int $row Zero indexed row |
831 | 833 | * @param int $col Zero indexed column |
832 | 834 | * @param string $formula The formula text string |
833 | - * @param mixed $xfIndex The XF format index |
|
835 | + * @param integer $xfIndex The XF format index |
|
834 | 836 | * @param mixed $calculatedValue Calculated value |
835 | 837 | * @return int |
836 | 838 | */ |
@@ -2299,8 +2301,8 @@ discard block |
||
2299 | 2301 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2300 | 2302 | * @param int $x The horizontal position (offset) of the image inside the cell. |
2301 | 2303 | * @param int $y The vertical position (offset) of the image inside the cell. |
2302 | - * @param float $scale_x The horizontal scale |
|
2303 | - * @param float $scale_y The vertical scale |
|
2304 | + * @param integer $scale_x The horizontal scale |
|
2305 | + * @param integer $scale_y The vertical scale |
|
2304 | 2306 | */ |
2305 | 2307 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2306 | 2308 | { |
@@ -1147,14 +1147,14 @@ |
||
1147 | 1147 | |
1148 | 1148 | // Pack the main data stream |
1149 | 1149 | $data = pack('vvvv', $row1, $row2, $col1, $col2) . |
1150 | - $unknown1 . |
|
1151 | - $link_type . |
|
1152 | - $unknown2 . |
|
1153 | - $up_count . |
|
1154 | - $dir_short_len . |
|
1155 | - $dir_short . |
|
1156 | - $unknown3 . |
|
1157 | - $stream_len; /*. |
|
1150 | + $unknown1 . |
|
1151 | + $link_type . |
|
1152 | + $unknown2 . |
|
1153 | + $up_count . |
|
1154 | + $dir_short_len . |
|
1155 | + $dir_short . |
|
1156 | + $unknown3 . |
|
1157 | + $stream_len; /*. |
|
1158 | 1158 | $dir_long_len . |
1159 | 1159 | $unknown4 . |
1160 | 1160 | $dir_long . |
@@ -181,7 +181,7 @@ |
||
181 | 181 | * |
182 | 182 | * @param \PhpSpreadsheet\Spreadsheet $spreadsheet PhpSpreadsheet object |
183 | 183 | * @throws \PhpSpreadsheet\Writer\Exception |
184 | - * @return Excel2007 |
|
184 | + * @return OpenDocument |
|
185 | 185 | */ |
186 | 186 | public function setSpreadsheet(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) |
187 | 187 | { |
@@ -140,8 +140,8 @@ |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
143 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
144 | - 'styleHashTable', |
|
143 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
144 | + 'styleHashTable', |
|
145 | 145 | ]; |
146 | 146 | |
147 | 147 | // Set HashTable variables |
@@ -170,21 +170,21 @@ |
||
170 | 170 | $ret = str_pad($this->Name, 64, "\x00"); |
171 | 171 | |
172 | 172 | $ret .= pack('v', strlen($this->Name) + 2) // 66 |
173 | - . pack('c', $this->Type) // 67 |
|
174 | - . pack('c', 0x00) //UK // 68 |
|
175 | - . pack('V', $this->PrevPps) //Prev // 72 |
|
176 | - . pack('V', $this->NextPps) //Next // 76 |
|
177 | - . pack('V', $this->DirPps) //Dir // 80 |
|
178 | - . "\x00\x09\x02\x00" // 84 |
|
179 | - . "\x00\x00\x00\x00" // 88 |
|
180 | - . "\xc0\x00\x00\x00" // 92 |
|
181 | - . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
182 | - . "\x00\x00\x00\x00" // 100 |
|
183 | - . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
184 | - . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
185 | - . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
186 | - . pack('V', $this->Size) // 124 |
|
187 | - . pack('V', 0); // 128 |
|
173 | + . pack('c', $this->Type) // 67 |
|
174 | + . pack('c', 0x00) //UK // 68 |
|
175 | + . pack('V', $this->PrevPps) //Prev // 72 |
|
176 | + . pack('V', $this->NextPps) //Next // 76 |
|
177 | + . pack('V', $this->DirPps) //Dir // 80 |
|
178 | + . "\x00\x09\x02\x00" // 84 |
|
179 | + . "\x00\x00\x00\x00" // 88 |
|
180 | + . "\xc0\x00\x00\x00" // 92 |
|
181 | + . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
182 | + . "\x00\x00\x00\x00" // 100 |
|
183 | + . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
184 | + . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
185 | + . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
186 | + . pack('V', $this->Size) // 124 |
|
187 | + . pack('V', 0); // 128 |
|
188 | 188 | return $ret; |
189 | 189 | } |
190 | 190 |