@@ -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 | ]; |
@@ -266,9 +266,9 @@ |
||
266 | 266 | |
267 | 267 | private static function castToString($c) |
268 | 268 | { |
269 | - if(strstr(strtolower($c->v), 'e') && !strstr(strtolower($c->v), 'e+')) { return $c->v; } |
|
270 | - // TODO: Should check cell type here and convert to string. It does not go well scientific notion "8.2276843555001E+18" etc. |
|
271 | - return isset($c->v) ? (string) $c->v : null; |
|
269 | + if(strstr(strtolower($c->v), 'e') && !strstr(strtolower($c->v), 'e+')) { return $c->v; } |
|
270 | + // TODO: Should check cell type here and convert to string. It does not go well scientific notion "8.2276843555001E+18" etc. |
|
271 | + return isset($c->v) ? (string) $c->v : null; |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType) |
@@ -266,7 +266,7 @@ |
||
266 | 266 | |
267 | 267 | private static function castToString($c) |
268 | 268 | { |
269 | - if(strstr(strtolower($c->v), 'e') && !strstr(strtolower($c->v), 'e+')) { return $c->v; } |
|
269 | + if (strstr(strtolower($c->v), 'e') && !strstr(strtolower($c->v), 'e+')) { return $c->v; } |
|
270 | 270 | // TODO: Should check cell type here and convert to string. It does not go well scientific notion "8.2276843555001E+18" etc. |
271 | 271 | return isset($c->v) ? (string) $c->v : null; |
272 | 272 | } |