@@ -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 | ]; |
@@ -1264,24 +1264,24 @@ |
||
1264 | 1264 | |
1265 | 1265 | // Loop through each sum and see if arguments and conditions are true |
1266 | 1266 | foreach ($sumArgs as $index => $value) { |
1267 | - $valid = true; |
|
1267 | + $valid = true; |
|
1268 | 1268 | |
1269 | - foreach ($conditions as $cidx => $condition) { |
|
1270 | - $arg = $aArgsArray[$cidx][$index]; |
|
1269 | + foreach ($conditions as $cidx => $condition) { |
|
1270 | + $arg = $aArgsArray[$cidx][$index]; |
|
1271 | 1271 | |
1272 | - // Loop through arguments |
|
1273 | - if (!is_numeric($arg)) { |
|
1274 | - $arg = Calculation::wrapResult(strtoupper($arg)); |
|
1275 | - } |
|
1276 | - $testCondition = '=' . $arg . $condition; |
|
1277 | - if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) { |
|
1278 | - // Is not a value within our criteria |
|
1279 | - $valid = false; |
|
1272 | + // Loop through arguments |
|
1273 | + if (!is_numeric($arg)) { |
|
1274 | + $arg = Calculation::wrapResult(strtoupper($arg)); |
|
1275 | + } |
|
1276 | + $testCondition = '=' . $arg . $condition; |
|
1277 | + if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) { |
|
1278 | + // Is not a value within our criteria |
|
1279 | + $valid = false; |
|
1280 | 1280 | break; // if false found, don't need to check other conditions |
1281 | - } |
|
1282 | - } |
|
1281 | + } |
|
1282 | + } |
|
1283 | 1283 | |
1284 | - if ($valid) { $returnValue += $value; } |
|
1284 | + if ($valid) { $returnValue += $value; } |
|
1285 | 1285 | } |
1286 | 1286 | |
1287 | 1287 | // Return |
@@ -1277,11 +1277,11 @@ |
||
1277 | 1277 | if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) { |
1278 | 1278 | // Is not a value within our criteria |
1279 | 1279 | $valid = false; |
1280 | - break; // if false found, don't need to check other conditions |
|
1280 | + break; // if false found, don't need to check other conditions |
|
1281 | 1281 | } |
1282 | 1282 | } |
1283 | 1283 | |
1284 | - if ($valid) { $returnValue += $value; } |
|
1284 | + if ($valid) { $returnValue += $value; } |
|
1285 | 1285 | } |
1286 | 1286 | |
1287 | 1287 | // Return |