@@ -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 | ]; |
@@ -15,9 +15,9 @@ |
||
15 | 15 | |
16 | 16 | $helper->log('Set active sheet index 0'); |
17 | 17 | $aSheet = $spreadsheet->setActiveSheetIndex(0); |
18 | -$drawing = $aSheet->getDrawingCollection(); |
|
18 | +$drawing = $aSheet->getDrawingCollection(); |
|
19 | 19 | /** @var $dr \PhpOffice\PhpSpreadsheet\Worksheet\Drawing */ |
20 | -foreach ($drawing as $dr){ |
|
21 | - $helper->log("links " . $dr->getHyperlink()->getUrl()); |
|
20 | +foreach ($drawing as $dr) { |
|
21 | + $helper->log("links " . $dr->getHyperlink()->getUrl()); |
|
22 | 22 | } |
23 | 23 | $helper->log('End'); |
@@ -124,8 +124,7 @@ discard block |
||
124 | 124 | $this->rotation = 0; |
125 | 125 | $this->shadow = new Drawing\Shadow(); |
126 | 126 | |
127 | - // Set image index |
|
128 | - ++self::$imageCounter; |
|
127 | + // Set image index++self::$imageCounter; |
|
129 | 128 | $this->imageIndex = self::$imageCounter; |
130 | 129 | } |
131 | 130 | |
@@ -530,7 +529,7 @@ discard block |
||
530 | 529 | */ |
531 | 530 | public function getHyperlink() |
532 | 531 | { |
533 | - if ($this->hyperlink === null){ |
|
532 | + if ($this->hyperlink === null) { |
|
534 | 533 | $this->hyperlink = new Hyperlink(); |
535 | 534 | } |
536 | 535 |
@@ -1550,7 +1550,7 @@ discard block |
||
1550 | 1550 | $hyperlinks = array(); |
1551 | 1551 | if ($relsDrawing && $relsDrawing->Relationship) { |
1552 | 1552 | foreach ($relsDrawing->Relationship as $ele) { |
1553 | - if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'){ |
|
1553 | + if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') { |
|
1554 | 1554 | $hyperlinks[(string) $ele['Id']] = (string) $ele['Target']; |
1555 | 1555 | } |
1556 | 1556 | if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') { |
@@ -1659,7 +1659,7 @@ discard block |
||
1659 | 1659 | $shadow->getColor()->setRGB(self::getArrayItem($outerShdw->srgbClr->attributes(), 'val')); |
1660 | 1660 | $shadow->setAlpha(self::getArrayItem($outerShdw->srgbClr->alpha->attributes(), 'val') / 1000); |
1661 | 1661 | } |
1662 | - if($hlinkClick) { |
|
1662 | + if ($hlinkClick) { |
|
1663 | 1663 | $hlinkId = (string) $hlinkClick->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships')['id']; |
1664 | 1664 | $hyperlink = new Hyperlink( |
1665 | 1665 | $hyperlinks[$hlinkId], |