@@ -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 | ]; |
@@ -692,14 +692,14 @@ discard block |
||
692 | 692 | |
693 | 693 | foreach ($xml->Styles[0] as $style) { |
694 | 694 | $style_ss = $style->attributes($namespaces['ss']); |
695 | - $styleID = (string)$style_ss['ID']; |
|
695 | + $styleID = (string) $style_ss['ID']; |
|
696 | 696 | $this->styles[$styleID] = (isset($this->styles['Default'])) ? $this->styles['Default'] : []; |
697 | 697 | foreach ($style as $styleType => $styleData) { |
698 | 698 | $styleAttributes = $styleData->attributes($namespaces['ss']); |
699 | 699 | switch ($styleType) { |
700 | 700 | case 'Alignment': |
701 | 701 | foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) { |
702 | - $styleAttributeValue = (string)$styleAttributeValue; |
|
702 | + $styleAttributeValue = (string) $styleAttributeValue; |
|
703 | 703 | switch ($styleAttributeKey) { |
704 | 704 | case 'Vertical': |
705 | 705 | if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) { |
@@ -754,7 +754,7 @@ discard block |
||
754 | 754 | break; |
755 | 755 | case 'Font': |
756 | 756 | foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) { |
757 | - $styleAttributeValue = (string)$styleAttributeValue; |
|
757 | + $styleAttributeValue = (string) $styleAttributeValue; |
|
758 | 758 | switch ($styleAttributeKey) { |
759 | 759 | case 'FontName': |
760 | 760 | $this->styles[$styleID]['font']['name'] = $styleAttributeValue; |