@@ -566,10 +566,10 @@ discard block |
||
566 | 566 | $objWriter->writeAttribute('operator', $dv->getOperator()); |
567 | 567 | } |
568 | 568 | |
569 | - $objWriter->writeAttribute('allowBlank', ($dv->getAllowBlank() ? '1' : '0')); |
|
570 | - $objWriter->writeAttribute('showDropDown', (!$dv->getShowDropDown() ? '1' : '0')); |
|
571 | - $objWriter->writeAttribute('showInputMessage', ($dv->getShowInputMessage() ? '1' : '0')); |
|
572 | - $objWriter->writeAttribute('showErrorMessage', ($dv->getShowErrorMessage() ? '1' : '0')); |
|
569 | + $objWriter->writeAttribute('allowBlank', ($dv->getAllowBlank() ? '1' : '0')); |
|
570 | + $objWriter->writeAttribute('showDropDown', (!$dv->getShowDropDown() ? '1' : '0')); |
|
571 | + $objWriter->writeAttribute('showInputMessage', ($dv->getShowInputMessage() ? '1' : '0')); |
|
572 | + $objWriter->writeAttribute('showErrorMessage', ($dv->getShowErrorMessage() ? '1' : '0')); |
|
573 | 573 | |
574 | 574 | if ($dv->getErrorTitle() !== '') { |
575 | 575 | $objWriter->writeAttribute('errorTitle', $dv->getErrorTitle()); |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | // printOptions |
708 | 708 | $objWriter->startElement('printOptions'); |
709 | 709 | |
710 | - $objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true': 'false')); |
|
710 | + $objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true' : 'false')); |
|
711 | 711 | $objWriter->writeAttribute('gridLinesSet', 'true'); |
712 | 712 | |
713 | 713 | if ($pSheet->getPageSetup()->getHorizontalCentered()) { |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | // Top 10 Filter Rule |
801 | 801 | $objWriter->writeAttribute('val', $rule->getValue()); |
802 | 802 | $objWriter->writeAttribute('percent', (($rule->getOperator() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0')); |
803 | - $objWriter->writeAttribute('top', (($rule->getGrouping() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0')); |
|
803 | + $objWriter->writeAttribute('top', (($rule->getGrouping() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1' : '0')); |
|
804 | 804 | } else { |
805 | 805 | // Filter, DateGroupItem or CustomFilter |
806 | 806 | $objWriter->startElement($rule->getRuleType()); |
@@ -1079,8 +1079,7 @@ discard block |
||
1079 | 1079 | break; |
1080 | 1080 | case 'f': // Formula |
1081 | 1081 | $calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ? |
1082 | - $pCell->getCalculatedValue() : |
|
1083 | - $cellValue; |
|
1082 | + $pCell->getCalculatedValue() : $cellValue; |
|
1084 | 1083 | if (is_string($calculatedValue)) { |
1085 | 1084 | $objWriter->writeAttribute('t', 'str'); |
1086 | 1085 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | // Create string lookup table |
41 | 41 | $aStringTable = []; |
42 | 42 | $cellCollection = null; |
43 | - $aFlippedStringTable = null; // For faster lookup |
|
43 | + $aFlippedStringTable = null; // For faster lookup |
|
44 | 44 | |
45 | 45 | // Is an existing table given? |
46 | 46 | if (($pExistingTable !== null) && is_array($pExistingTable)) { |
@@ -67,72 +67,72 @@ |
||
67 | 67 | * @var array |
68 | 68 | */ |
69 | 69 | protected static $paperSizes = [ |
70 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER => 'LETTER', // (8.5 in. by 11 in.) |
|
71 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', // (8.5 in. by 11 in.) |
|
72 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], // (11 in. by 17 in.) |
|
73 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER => [1224.00, 792.00], // (17 in. by 11 in.) |
|
74 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL => 'LEGAL', // (8.5 in. by 14 in.) |
|
75 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT => [396.00, 612.00], // (5.5 in. by 8.5 in.) |
|
76 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE => 'EXECUTIVE', // (7.25 in. by 10.5 in.) |
|
77 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 => 'A3', // (297 mm by 420 mm) |
|
78 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 => 'A4', // (210 mm by 297 mm) |
|
79 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL => 'A4', // (210 mm by 297 mm) |
|
80 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 => 'A5', // (148 mm by 210 mm) |
|
81 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 => 'B4', // (250 mm by 353 mm) |
|
82 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 => 'B5', // (176 mm by 250 mm) |
|
83 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO => 'FOLIO', // (8.5 in. by 13 in.) |
|
84 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO => [609.45, 779.53], // (215 mm by 275 mm) |
|
85 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 => [720.00, 1008.00], // (10 in. by 14 in.) |
|
86 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 => [792.00, 1224.00], // (11 in. by 17 in.) |
|
87 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE => 'LETTER', // (8.5 in. by 11 in.) |
|
88 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE => [279.00, 639.00], // (3.875 in. by 8.875 in.) |
|
89 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE => [297.00, 684.00], // (4.125 in. by 9.5 in.) |
|
90 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE => [324.00, 747.00], // (4.5 in. by 10.375 in.) |
|
91 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE => [342.00, 792.00], // (4.75 in. by 11 in.) |
|
92 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE => [360.00, 828.00], // (5 in. by 11.5 in.) |
|
93 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C => [1224.00, 1584.00], // (17 in. by 22 in.) |
|
94 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D => [1584.00, 2448.00], // (22 in. by 34 in.) |
|
95 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E => [2448.00, 3168.00], // (34 in. by 44 in.) |
|
96 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE => [311.81, 623.62], // (110 mm by 220 mm) |
|
97 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE => 'C5', // (162 mm by 229 mm) |
|
98 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE => 'C3', // (324 mm by 458 mm) |
|
99 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE => 'C4', // (229 mm by 324 mm) |
|
100 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE => 'C6', // (114 mm by 162 mm) |
|
101 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE => [323.15, 649.13], // (114 mm by 229 mm) |
|
102 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE => 'B4', // (250 mm by 353 mm) |
|
103 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE => 'B5', // (176 mm by 250 mm) |
|
104 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE => [498.90, 354.33], // (176 mm by 125 mm) |
|
105 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE => [311.81, 651.97], // (110 mm by 230 mm) |
|
106 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE => [279.00, 540.00], // (3.875 in. by 7.5 in.) |
|
107 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE => [261.00, 468.00], // (3.625 in. by 6.5 in.) |
|
108 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD => [1071.00, 792.00], // (14.875 in. by 11 in.) |
|
109 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD => [612.00, 864.00], // (8.5 in. by 12 in.) |
|
110 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD => 'FOLIO', // (8.5 in. by 13 in.) |
|
111 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 => 'B4', // (250 mm by 353 mm) |
|
112 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD => [566.93, 419.53], // (200 mm by 148 mm) |
|
113 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 => [648.00, 792.00], // (9 in. by 11 in.) |
|
114 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 => [720.00, 792.00], // (10 in. by 11 in.) |
|
115 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 => [1080.00, 792.00], // (15 in. by 11 in.) |
|
116 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE => [623.62, 623.62], // (220 mm by 220 mm) |
|
117 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) |
|
118 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER => [667.80, 1080.00], // (9.275 in. by 15 in.) |
|
119 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER => [841.68, 1296.00], // (11.69 in. by 18 in.) |
|
120 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER => [668.98, 912.76], // (236 mm by 322 mm) |
|
121 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER => [595.80, 792.00], // (8.275 in. by 11 in.) |
|
122 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER => 'A4', // (210 mm by 297 mm) |
|
123 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) |
|
124 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER => [643.46, 1009.13], // (227 mm by 356 mm) |
|
125 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER => [864.57, 1380.47], // (305 mm by 487 mm) |
|
126 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER => [612.00, 913.68], // (8.5 in. by 12.69 in.) |
|
127 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER => [595.28, 935.43], // (210 mm by 330 mm) |
|
128 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER => 'A5', // (148 mm by 210 mm) |
|
129 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER => [515.91, 728.50], // (182 mm by 257 mm) |
|
130 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) |
|
131 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER => [493.23, 666.14], // (174 mm by 235 mm) |
|
132 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER => [569.76, 782.36], // (201 mm by 276 mm) |
|
133 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER => 'A2', // (420 mm by 594 mm) |
|
134 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER => 'A3', // (297 mm by 420 mm) |
|
135 | - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) |
|
70 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER => 'LETTER', // (8.5 in. by 11 in.) |
|
71 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', // (8.5 in. by 11 in.) |
|
72 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], // (11 in. by 17 in.) |
|
73 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER => [1224.00, 792.00], // (17 in. by 11 in.) |
|
74 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL => 'LEGAL', // (8.5 in. by 14 in.) |
|
75 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT => [396.00, 612.00], // (5.5 in. by 8.5 in.) |
|
76 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE => 'EXECUTIVE', // (7.25 in. by 10.5 in.) |
|
77 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 => 'A3', // (297 mm by 420 mm) |
|
78 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 => 'A4', // (210 mm by 297 mm) |
|
79 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL => 'A4', // (210 mm by 297 mm) |
|
80 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 => 'A5', // (148 mm by 210 mm) |
|
81 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 => 'B4', // (250 mm by 353 mm) |
|
82 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 => 'B5', // (176 mm by 250 mm) |
|
83 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO => 'FOLIO', // (8.5 in. by 13 in.) |
|
84 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO => [609.45, 779.53], // (215 mm by 275 mm) |
|
85 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 => [720.00, 1008.00], // (10 in. by 14 in.) |
|
86 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 => [792.00, 1224.00], // (11 in. by 17 in.) |
|
87 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE => 'LETTER', // (8.5 in. by 11 in.) |
|
88 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE => [279.00, 639.00], // (3.875 in. by 8.875 in.) |
|
89 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE => [297.00, 684.00], // (4.125 in. by 9.5 in.) |
|
90 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE => [324.00, 747.00], // (4.5 in. by 10.375 in.) |
|
91 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE => [342.00, 792.00], // (4.75 in. by 11 in.) |
|
92 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE => [360.00, 828.00], // (5 in. by 11.5 in.) |
|
93 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C => [1224.00, 1584.00], // (17 in. by 22 in.) |
|
94 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D => [1584.00, 2448.00], // (22 in. by 34 in.) |
|
95 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E => [2448.00, 3168.00], // (34 in. by 44 in.) |
|
96 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE => [311.81, 623.62], // (110 mm by 220 mm) |
|
97 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE => 'C5', // (162 mm by 229 mm) |
|
98 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE => 'C3', // (324 mm by 458 mm) |
|
99 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE => 'C4', // (229 mm by 324 mm) |
|
100 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE => 'C6', // (114 mm by 162 mm) |
|
101 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE => [323.15, 649.13], // (114 mm by 229 mm) |
|
102 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE => 'B4', // (250 mm by 353 mm) |
|
103 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE => 'B5', // (176 mm by 250 mm) |
|
104 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE => [498.90, 354.33], // (176 mm by 125 mm) |
|
105 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE => [311.81, 651.97], // (110 mm by 230 mm) |
|
106 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE => [279.00, 540.00], // (3.875 in. by 7.5 in.) |
|
107 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE => [261.00, 468.00], // (3.625 in. by 6.5 in.) |
|
108 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD => [1071.00, 792.00], // (14.875 in. by 11 in.) |
|
109 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD => [612.00, 864.00], // (8.5 in. by 12 in.) |
|
110 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD => 'FOLIO', // (8.5 in. by 13 in.) |
|
111 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 => 'B4', // (250 mm by 353 mm) |
|
112 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD => [566.93, 419.53], // (200 mm by 148 mm) |
|
113 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 => [648.00, 792.00], // (9 in. by 11 in.) |
|
114 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 => [720.00, 792.00], // (10 in. by 11 in.) |
|
115 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 => [1080.00, 792.00], // (15 in. by 11 in.) |
|
116 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE => [623.62, 623.62], // (220 mm by 220 mm) |
|
117 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) |
|
118 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER => [667.80, 1080.00], // (9.275 in. by 15 in.) |
|
119 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER => [841.68, 1296.00], // (11.69 in. by 18 in.) |
|
120 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER => [668.98, 912.76], // (236 mm by 322 mm) |
|
121 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER => [595.80, 792.00], // (8.275 in. by 11 in.) |
|
122 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER => 'A4', // (210 mm by 297 mm) |
|
123 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) |
|
124 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER => [643.46, 1009.13], // (227 mm by 356 mm) |
|
125 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER => [864.57, 1380.47], // (305 mm by 487 mm) |
|
126 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER => [612.00, 913.68], // (8.5 in. by 12.69 in.) |
|
127 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER => [595.28, 935.43], // (210 mm by 330 mm) |
|
128 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER => 'A5', // (148 mm by 210 mm) |
|
129 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER => [515.91, 728.50], // (182 mm by 257 mm) |
|
130 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) |
|
131 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER => [493.23, 666.14], // (174 mm by 235 mm) |
|
132 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER => [569.76, 782.36], // (201 mm by 276 mm) |
|
133 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER => 'A2', // (420 mm by 594 mm) |
|
134 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER => 'A3', // (297 mm by 420 mm) |
|
135 | + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) |
|
136 | 136 | ]; |
137 | 137 | |
138 | 138 | /** |
@@ -169,8 +169,7 @@ discard block |
||
169 | 169 | { |
170 | 170 | $aBreaks = $pSheet->getBreaks(); |
171 | 171 | ($pNumCols > 0 || $pNumRows > 0) ? |
172 | - uksort($aBreaks, ['self', 'cellReverseSort']) : |
|
173 | - uksort($aBreaks, ['self', 'cellSort']); |
|
172 | + uksort($aBreaks, ['self', 'cellReverseSort']) : uksort($aBreaks, ['self', 'cellSort']); |
|
174 | 173 | |
175 | 174 | foreach ($aBreaks as $key => $value) { |
176 | 175 | if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) { |
@@ -230,8 +229,7 @@ discard block |
||
230 | 229 | { |
231 | 230 | $aHyperlinkCollection = $pSheet->getHyperlinkCollection(); |
232 | 231 | ($pNumCols > 0 || $pNumRows > 0) ? |
233 | - uksort($aHyperlinkCollection, ['self', 'cellReverseSort']) : |
|
234 | - uksort($aHyperlinkCollection, ['self', 'cellSort']); |
|
232 | + uksort($aHyperlinkCollection, ['self', 'cellReverseSort']) : uksort($aHyperlinkCollection, ['self', 'cellSort']); |
|
235 | 233 | |
236 | 234 | foreach ($aHyperlinkCollection as $key => $value) { |
237 | 235 | $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); |
@@ -256,8 +254,7 @@ discard block |
||
256 | 254 | { |
257 | 255 | $aDataValidationCollection = $pSheet->getDataValidationCollection(); |
258 | 256 | ($pNumCols > 0 || $pNumRows > 0) ? |
259 | - uksort($aDataValidationCollection, ['self', 'cellReverseSort']) : |
|
260 | - uksort($aDataValidationCollection, ['self', 'cellSort']); |
|
257 | + uksort($aDataValidationCollection, ['self', 'cellReverseSort']) : uksort($aDataValidationCollection, ['self', 'cellSort']); |
|
261 | 258 | |
262 | 259 | foreach ($aDataValidationCollection as $key => $value) { |
263 | 260 | $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); |
@@ -303,8 +300,7 @@ discard block |
||
303 | 300 | { |
304 | 301 | $aProtectedCells = $pSheet->getProtectedCells(); |
305 | 302 | ($pNumCols > 0 || $pNumRows > 0) ? |
306 | - uksort($aProtectedCells, ['self', 'cellReverseSort']) : |
|
307 | - uksort($aProtectedCells, ['self', 'cellSort']); |
|
303 | + uksort($aProtectedCells, ['self', 'cellReverseSort']) : uksort($aProtectedCells, ['self', 'cellSort']); |
|
308 | 304 | foreach ($aProtectedCells as $key => $value) { |
309 | 305 | $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); |
310 | 306 | if ($key != $newReference) { |
@@ -34,14 +34,14 @@ |
||
34 | 34 | const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous'; |
35 | 35 | const HORIZONTAL_JUSTIFY = 'justify'; |
36 | 36 | const HORIZONTAL_FILL = 'fill'; |
37 | - const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
37 | + const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
38 | 38 | |
39 | 39 | /* Vertical alignment styles */ |
40 | 40 | const VERTICAL_BOTTOM = 'bottom'; |
41 | 41 | const VERTICAL_TOP = 'top'; |
42 | 42 | const VERTICAL_CENTER = 'center'; |
43 | 43 | const VERTICAL_JUSTIFY = 'justify'; |
44 | - const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
44 | + const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
45 | 45 | |
46 | 46 | /* Read order */ |
47 | 47 | const READORDER_CONTEXT = 0; |
@@ -362,62 +362,62 @@ |
||
362 | 362 | // Indexed colors |
363 | 363 | if (is_null(self::$indexedColors)) { |
364 | 364 | self::$indexedColors = [ |
365 | - 1 => 'FF000000', // System Colour #1 - Black |
|
366 | - 2 => 'FFFFFFFF', // System Colour #2 - White |
|
367 | - 3 => 'FFFF0000', // System Colour #3 - Red |
|
368 | - 4 => 'FF00FF00', // System Colour #4 - Green |
|
369 | - 5 => 'FF0000FF', // System Colour #5 - Blue |
|
370 | - 6 => 'FFFFFF00', // System Colour #6 - Yellow |
|
371 | - 7 => 'FFFF00FF', // System Colour #7- Magenta |
|
372 | - 8 => 'FF00FFFF', // System Colour #8- Cyan |
|
373 | - 9 => 'FF800000', // Standard Colour #9 |
|
374 | - 10 => 'FF008000', // Standard Colour #10 |
|
375 | - 11 => 'FF000080', // Standard Colour #11 |
|
376 | - 12 => 'FF808000', // Standard Colour #12 |
|
377 | - 13 => 'FF800080', // Standard Colour #13 |
|
378 | - 14 => 'FF008080', // Standard Colour #14 |
|
379 | - 15 => 'FFC0C0C0', // Standard Colour #15 |
|
380 | - 16 => 'FF808080', // Standard Colour #16 |
|
381 | - 17 => 'FF9999FF', // Chart Fill Colour #17 |
|
382 | - 18 => 'FF993366', // Chart Fill Colour #18 |
|
383 | - 19 => 'FFFFFFCC', // Chart Fill Colour #19 |
|
384 | - 20 => 'FFCCFFFF', // Chart Fill Colour #20 |
|
385 | - 21 => 'FF660066', // Chart Fill Colour #21 |
|
386 | - 22 => 'FFFF8080', // Chart Fill Colour #22 |
|
387 | - 23 => 'FF0066CC', // Chart Fill Colour #23 |
|
388 | - 24 => 'FFCCCCFF', // Chart Fill Colour #24 |
|
389 | - 25 => 'FF000080', // Chart Line Colour #25 |
|
390 | - 26 => 'FFFF00FF', // Chart Line Colour #26 |
|
391 | - 27 => 'FFFFFF00', // Chart Line Colour #27 |
|
392 | - 28 => 'FF00FFFF', // Chart Line Colour #28 |
|
393 | - 29 => 'FF800080', // Chart Line Colour #29 |
|
394 | - 30 => 'FF800000', // Chart Line Colour #30 |
|
395 | - 31 => 'FF008080', // Chart Line Colour #31 |
|
396 | - 32 => 'FF0000FF', // Chart Line Colour #32 |
|
397 | - 33 => 'FF00CCFF', // Standard Colour #33 |
|
398 | - 34 => 'FFCCFFFF', // Standard Colour #34 |
|
399 | - 35 => 'FFCCFFCC', // Standard Colour #35 |
|
400 | - 36 => 'FFFFFF99', // Standard Colour #36 |
|
401 | - 37 => 'FF99CCFF', // Standard Colour #37 |
|
402 | - 38 => 'FFFF99CC', // Standard Colour #38 |
|
403 | - 39 => 'FFCC99FF', // Standard Colour #39 |
|
404 | - 40 => 'FFFFCC99', // Standard Colour #40 |
|
405 | - 41 => 'FF3366FF', // Standard Colour #41 |
|
406 | - 42 => 'FF33CCCC', // Standard Colour #42 |
|
407 | - 43 => 'FF99CC00', // Standard Colour #43 |
|
408 | - 44 => 'FFFFCC00', // Standard Colour #44 |
|
409 | - 45 => 'FFFF9900', // Standard Colour #45 |
|
410 | - 46 => 'FFFF6600', // Standard Colour #46 |
|
411 | - 47 => 'FF666699', // Standard Colour #47 |
|
412 | - 48 => 'FF969696', // Standard Colour #48 |
|
413 | - 49 => 'FF003366', // Standard Colour #49 |
|
414 | - 50 => 'FF339966', // Standard Colour #50 |
|
415 | - 51 => 'FF003300', // Standard Colour #51 |
|
416 | - 52 => 'FF333300', // Standard Colour #52 |
|
417 | - 53 => 'FF993300', // Standard Colour #53 |
|
418 | - 54 => 'FF993366', // Standard Colour #54 |
|
419 | - 55 => 'FF333399', // Standard Colour #55 |
|
420 | - 56 => 'FF333333', // Standard Colour #56 |
|
365 | + 1 => 'FF000000', // System Colour #1 - Black |
|
366 | + 2 => 'FFFFFFFF', // System Colour #2 - White |
|
367 | + 3 => 'FFFF0000', // System Colour #3 - Red |
|
368 | + 4 => 'FF00FF00', // System Colour #4 - Green |
|
369 | + 5 => 'FF0000FF', // System Colour #5 - Blue |
|
370 | + 6 => 'FFFFFF00', // System Colour #6 - Yellow |
|
371 | + 7 => 'FFFF00FF', // System Colour #7- Magenta |
|
372 | + 8 => 'FF00FFFF', // System Colour #8- Cyan |
|
373 | + 9 => 'FF800000', // Standard Colour #9 |
|
374 | + 10 => 'FF008000', // Standard Colour #10 |
|
375 | + 11 => 'FF000080', // Standard Colour #11 |
|
376 | + 12 => 'FF808000', // Standard Colour #12 |
|
377 | + 13 => 'FF800080', // Standard Colour #13 |
|
378 | + 14 => 'FF008080', // Standard Colour #14 |
|
379 | + 15 => 'FFC0C0C0', // Standard Colour #15 |
|
380 | + 16 => 'FF808080', // Standard Colour #16 |
|
381 | + 17 => 'FF9999FF', // Chart Fill Colour #17 |
|
382 | + 18 => 'FF993366', // Chart Fill Colour #18 |
|
383 | + 19 => 'FFFFFFCC', // Chart Fill Colour #19 |
|
384 | + 20 => 'FFCCFFFF', // Chart Fill Colour #20 |
|
385 | + 21 => 'FF660066', // Chart Fill Colour #21 |
|
386 | + 22 => 'FFFF8080', // Chart Fill Colour #22 |
|
387 | + 23 => 'FF0066CC', // Chart Fill Colour #23 |
|
388 | + 24 => 'FFCCCCFF', // Chart Fill Colour #24 |
|
389 | + 25 => 'FF000080', // Chart Line Colour #25 |
|
390 | + 26 => 'FFFF00FF', // Chart Line Colour #26 |
|
391 | + 27 => 'FFFFFF00', // Chart Line Colour #27 |
|
392 | + 28 => 'FF00FFFF', // Chart Line Colour #28 |
|
393 | + 29 => 'FF800080', // Chart Line Colour #29 |
|
394 | + 30 => 'FF800000', // Chart Line Colour #30 |
|
395 | + 31 => 'FF008080', // Chart Line Colour #31 |
|
396 | + 32 => 'FF0000FF', // Chart Line Colour #32 |
|
397 | + 33 => 'FF00CCFF', // Standard Colour #33 |
|
398 | + 34 => 'FFCCFFFF', // Standard Colour #34 |
|
399 | + 35 => 'FFCCFFCC', // Standard Colour #35 |
|
400 | + 36 => 'FFFFFF99', // Standard Colour #36 |
|
401 | + 37 => 'FF99CCFF', // Standard Colour #37 |
|
402 | + 38 => 'FFFF99CC', // Standard Colour #38 |
|
403 | + 39 => 'FFCC99FF', // Standard Colour #39 |
|
404 | + 40 => 'FFFFCC99', // Standard Colour #40 |
|
405 | + 41 => 'FF3366FF', // Standard Colour #41 |
|
406 | + 42 => 'FF33CCCC', // Standard Colour #42 |
|
407 | + 43 => 'FF99CC00', // Standard Colour #43 |
|
408 | + 44 => 'FFFFCC00', // Standard Colour #44 |
|
409 | + 45 => 'FFFF9900', // Standard Colour #45 |
|
410 | + 46 => 'FFFF6600', // Standard Colour #46 |
|
411 | + 47 => 'FF666699', // Standard Colour #47 |
|
412 | + 48 => 'FF969696', // Standard Colour #48 |
|
413 | + 49 => 'FF003366', // Standard Colour #49 |
|
414 | + 50 => 'FF339966', // Standard Colour #50 |
|
415 | + 51 => 'FF003300', // Standard Colour #51 |
|
416 | + 52 => 'FF333300', // Standard Colour #52 |
|
417 | + 53 => 'FF993300', // Standard Colour #53 |
|
418 | + 54 => 'FF993366', // Standard Colour #54 |
|
419 | + 55 => 'FF333399', // Standard Colour #55 |
|
420 | + 56 => 'FF333333', // Standard Colour #56 |
|
421 | 421 | ]; |
422 | 422 | } |
423 | 423 |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | self::$builtInFormats[11] = '0.00E+00'; |
287 | 287 | self::$builtInFormats[12] = '# ?/?'; |
288 | 288 | self::$builtInFormats[13] = '# ??/??'; |
289 | - self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy'; |
|
289 | + self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy'; |
|
290 | 290 | self::$builtInFormats[15] = 'd-mmm-yy'; |
291 | 291 | self::$builtInFormats[16] = 'd-mmm'; |
292 | 292 | self::$builtInFormats[17] = 'mmm-yy'; |
@@ -294,17 +294,17 @@ discard block |
||
294 | 294 | self::$builtInFormats[19] = 'h:mm:ss AM/PM'; |
295 | 295 | self::$builtInFormats[20] = 'h:mm'; |
296 | 296 | self::$builtInFormats[21] = 'h:mm:ss'; |
297 | - self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm'; |
|
297 | + self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm'; |
|
298 | 298 | |
299 | - self::$builtInFormats[37] = '#,##0_);(#,##0)'; // Despite ECMA '#,##0 ;(#,##0)'; |
|
300 | - self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; // Despite ECMA '#,##0 ;[Red](#,##0)'; |
|
301 | - self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; // Despite ECMA '#,##0.00;(#,##0.00)'; |
|
302 | - self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; // Despite ECMA '#,##0.00;[Red](#,##0.00)'; |
|
299 | + self::$builtInFormats[37] = '#,##0_);(#,##0)'; // Despite ECMA '#,##0 ;(#,##0)'; |
|
300 | + self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; // Despite ECMA '#,##0 ;[Red](#,##0)'; |
|
301 | + self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; // Despite ECMA '#,##0.00;(#,##0.00)'; |
|
302 | + self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; // Despite ECMA '#,##0.00;[Red](#,##0.00)'; |
|
303 | 303 | |
304 | 304 | self::$builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)'; |
305 | 305 | self::$builtInFormats[45] = 'mm:ss'; |
306 | 306 | self::$builtInFormats[46] = '[h]:mm:ss'; |
307 | - self::$builtInFormats[47] = 'mm:ss.0'; // Despite ECMA 'mmss.0'; |
|
307 | + self::$builtInFormats[47] = 'mm:ss.0'; // Despite ECMA 'mmss.0'; |
|
308 | 308 | self::$builtInFormats[48] = '##0.0E+0'; |
309 | 309 | self::$builtInFormats[49] = '@'; |
310 | 310 |
@@ -2962,7 +2962,7 @@ discard block |
||
2962 | 2962 | if ($this->getCodeName() == $pValue) { |
2963 | 2963 | return $this; |
2964 | 2964 | } |
2965 | - $pValue = str_replace(' ', '_', $pValue);//Excel does this automatically without flinching, we are doing the same |
|
2965 | + $pValue = str_replace(' ', '_', $pValue); //Excel does this automatically without flinching, we are doing the same |
|
2966 | 2966 | // Syntax check |
2967 | 2967 | // throw an exception if not valid |
2968 | 2968 | self::checkSheetCodeName($pValue); |
@@ -2991,7 +2991,7 @@ discard block |
||
2991 | 2991 | } |
2992 | 2992 | } |
2993 | 2993 | |
2994 | - $pValue = $pValue . '_' . $i;// ok, we have a valid name |
|
2994 | + $pValue = $pValue . '_' . $i; // ok, we have a valid name |
|
2995 | 2995 | //codeName is'nt used in formula : no need to call for an update |
2996 | 2996 | //return $this->setTitle($altTitle, $updateFormulaCellReferences); |
2997 | 2997 | } |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | private static $height = 480; |
34 | 34 | |
35 | 35 | private static $colourSet = [ |
36 | - 'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1', |
|
37 | - 'darkmagenta', 'coral', 'dodgerblue3', 'eggplant', |
|
38 | - 'mediumblue', 'magenta', 'sandybrown', 'cyan', |
|
39 | - 'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen', |
|
36 | + 'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1', |
|
37 | + 'darkmagenta', 'coral', 'dodgerblue3', 'eggplant', |
|
38 | + 'mediumblue', 'magenta', 'sandybrown', 'cyan', |
|
39 | + 'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen', |
|
40 | 40 | 'goldenrod2', |
41 | 41 | ]; |
42 | 42 | |
@@ -178,21 +178,21 @@ discard block |
||
178 | 178 | $legendOverlay = $legend->getOverlay(); |
179 | 179 | switch ($legendPosition) { |
180 | 180 | case 'r': |
181 | - $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); // right |
|
181 | + $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); // right |
|
182 | 182 | $this->graph->legend->SetColumns(1); |
183 | 183 | break; |
184 | 184 | case 'l': |
185 | - $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); // left |
|
185 | + $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); // left |
|
186 | 186 | $this->graph->legend->SetColumns(1); |
187 | 187 | break; |
188 | 188 | case 't': |
189 | - $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top |
|
189 | + $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top |
|
190 | 190 | break; |
191 | 191 | case 'b': |
192 | - $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom |
|
192 | + $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom |
|
193 | 193 | break; |
194 | 194 | default: |
195 | - $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right |
|
195 | + $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right |
|
196 | 196 | $this->graph->legend->SetColumns(1); |
197 | 197 | break; |
198 | 198 | } |