@@ -137,8 +137,7 @@ |
||
137 | 137 | $this->rotation = 0; |
138 | 138 | $this->shadow = new Drawing\Shadow(); |
139 | 139 | |
140 | - // Set image index |
|
141 | - ++self::$imageCounter; |
|
140 | + // Set image index++self::$imageCounter; |
|
142 | 141 | $this->imageIndex = self::$imageCounter; |
143 | 142 | } |
144 | 143 |
@@ -4,53 +4,53 @@ |
||
4 | 4 | |
5 | 5 | return [ |
6 | 6 | [ |
7 | - 19, // Result for Excel |
|
8 | - 19, // Result for OpenOffice |
|
7 | + 19, // Result for Excel |
|
8 | + 19, // Result for OpenOffice |
|
9 | 9 | 22269, |
10 | 10 | ], |
11 | 11 | [ |
12 | - 1, // Result for Excel |
|
13 | - 1, // Result for OpenOffice |
|
12 | + 1, // Result for Excel |
|
13 | + 1, // Result for OpenOffice |
|
14 | 14 | 30348, |
15 | 15 | ], |
16 | 16 | [ |
17 | - 10, // Result for Excel |
|
18 | - 10, // Result for OpenOffice |
|
17 | + 10, // Result for Excel |
|
18 | + 10, // Result for OpenOffice |
|
19 | 19 | 30843, |
20 | 20 | ], |
21 | 21 | [ |
22 | - 11, // Result for Excel |
|
23 | - 11, // Result for OpenOffice |
|
22 | + 11, // Result for Excel |
|
23 | + 11, // Result for OpenOffice |
|
24 | 24 | '11-Nov-1918', |
25 | 25 | ], |
26 | 26 | [ |
27 | - 28, // Result for Excel |
|
28 | - 28, // Result for OpenOffice |
|
27 | + 28, // Result for Excel |
|
28 | + 28, // Result for OpenOffice |
|
29 | 29 | '28-Feb-1904', |
30 | 30 | ], |
31 | 31 | [ |
32 | - '#VALUE!', // Result for Excel |
|
33 | - '#VALUE!', // Result for OpenOffice |
|
32 | + '#VALUE!', // Result for Excel |
|
33 | + '#VALUE!', // Result for OpenOffice |
|
34 | 34 | 'Invalid', |
35 | 35 | ], |
36 | 36 | [ |
37 | - '#NUM!', // Result for Excel |
|
38 | - 29, // Result for OpenOffice |
|
37 | + '#NUM!', // Result for Excel |
|
38 | + 29, // Result for OpenOffice |
|
39 | 39 | -1, |
40 | 40 | ], |
41 | 41 | [ |
42 | - 1, // Result for Excel |
|
43 | - 31, // Result for OpenOffice |
|
42 | + 1, // Result for Excel |
|
43 | + 31, // Result for OpenOffice |
|
44 | 44 | 1, |
45 | 45 | ], |
46 | 46 | [ |
47 | - 0, // Result for Excel |
|
48 | - 30, // Result for OpenOffice |
|
47 | + 0, // Result for Excel |
|
48 | + 30, // Result for OpenOffice |
|
49 | 49 | 0.5, |
50 | 50 | ], |
51 | 51 | [ |
52 | - 0, // Result for Excel |
|
53 | - 30, // Result for OpenOffice |
|
52 | + 0, // Result for Excel |
|
53 | + 30, // Result for OpenOffice |
|
54 | 54 | 0, |
55 | 55 | ], |
56 | 56 | ]; |
@@ -3849,7 +3849,7 @@ |
||
3849 | 3849 | * |
3850 | 3850 | * @return bool |
3851 | 3851 | */ |
3852 | - private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack &$stack, $recursingArrays = false) |
|
3852 | + private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack & $stack, $recursingArrays = false) |
|
3853 | 3853 | { |
3854 | 3854 | // If we're dealing with matrix operations, we want a matrix result |
3855 | 3855 | if ((is_array($operand1)) || (is_array($operand2))) { |
@@ -980,7 +980,7 @@ discard block |
||
980 | 980 | (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSBLANKS |
981 | 981 | ) && |
982 | 982 | isset($dxfs[(int) ($cfRule['dxfId'])]) |
983 | - ){ |
|
983 | + ) { |
|
984 | 984 | $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule; |
985 | 985 | } |
986 | 986 | } |
@@ -998,7 +998,7 @@ discard block |
||
998 | 998 | $objConditional->setText((string) $cfRule['text']); |
999 | 999 | } |
1000 | 1000 | |
1001 | - if( (true === isset($cfRule['stopIfTrue'])) && ((int) $cfRule['stopIfTrue'] === 1) ) { |
|
1001 | + if ((true === isset($cfRule['stopIfTrue'])) && ((int) $cfRule['stopIfTrue'] === 1)) { |
|
1002 | 1002 | $objConditional->setStopIfTrue(Conditional::IF_TRUE_STOP); |
1003 | 1003 | } |
1004 | 1004 |
@@ -491,7 +491,7 @@ |
||
491 | 491 | $objWriter->writeAttribute('text', $conditional->getText()); |
492 | 492 | } |
493 | 493 | |
494 | - if( $conditional->getStopIfTrue() == Conditional::IF_TRUE_STOP ) { |
|
494 | + if ($conditional->getStopIfTrue() == Conditional::IF_TRUE_STOP) { |
|
495 | 495 | $objWriter->writeAttribute('stopIfTrue', '1'); |
496 | 496 | } |
497 | 497 |