@@ -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 | ]; |
@@ -1464,7 +1464,7 @@ discard block |
||
1464 | 1464 | // unparsed vmlDrawing |
1465 | 1465 | if ($unparsedVmlDrawings) { |
1466 | 1466 | foreach ($unparsedVmlDrawings as $rId => $relPath) { |
1467 | - $rId = substr($rId, 3); // rIdXXX |
|
1467 | + $rId = substr($rId, 3); // rIdXXX |
|
1468 | 1468 | $unparsedVmlDrawing = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['vmlDrawings']; |
1469 | 1469 | $unparsedVmlDrawing[$rId] = []; |
1470 | 1470 | $unparsedVmlDrawing[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $relPath); |
@@ -2350,7 +2350,7 @@ discard block |
||
2350 | 2350 | |
2351 | 2351 | $unparsedCtrlProps = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['ctrlProps']; |
2352 | 2352 | foreach ($ctrlProps as $rId => $ctrlProp) { |
2353 | - $rId = substr($rId, 3); // rIdXXX |
|
2353 | + $rId = substr($rId, 3); // rIdXXX |
|
2354 | 2354 | $unparsedCtrlProps[$rId] = []; |
2355 | 2355 | $unparsedCtrlProps[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $ctrlProp['Target']); |
2356 | 2356 | $unparsedCtrlProps[$rId]['relFilePath'] = (string) $ctrlProp['Target']; |
@@ -2382,7 +2382,7 @@ discard block |
||
2382 | 2382 | |
2383 | 2383 | $unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings']; |
2384 | 2384 | foreach ($sheetPrinterSettings as $rId => $printerSettings) { |
2385 | - $rId = substr($rId, 3); // rIdXXX |
|
2385 | + $rId = substr($rId, 3); // rIdXXX |
|
2386 | 2386 | $unparsedPrinterSettings[$rId] = []; |
2387 | 2387 | $unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $printerSettings['Target']); |
2388 | 2388 | $unparsedPrinterSettings[$rId]['relFilePath'] = (string) $printerSettings['Target']; |
@@ -17,7 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | $sampleFilename = './data/Writer/XLSX/form_pass_print.xlsm'; |
19 | 19 | $resultFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test'); |
20 | - Settings::setLibXmlLoaderOptions(null); // reset to default options |
|
20 | + Settings::setLibXmlLoaderOptions(null); // reset to default options |
|
21 | 21 | $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx(); |
22 | 22 | $excel = $reader->load($sampleFilename); |
23 | 23 |