alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix to UOM Conversion where input UoM is the same as output UoM 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@88979 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2012-04-08 14:52:27 +00:00
parent 64cc573a1e
commit 193a766ab3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Calculation/Engineering.php
View File

@ -2471,7 +2471,9 @@ class PHPExcel_Calculation_Engineering {
} }
if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) { if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
return $value; // We've already factored $fromMultiplier into the value, so we need
// to reverse it again
return $value / $fromMultiplier;
} elseif ($unitGroup1 == 'Temperature') { } elseif ($unitGroup1 == 'Temperature') {
if (($fromUOM == 'F') || ($fromUOM == 'fah')) { if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
if (($toUOM == 'F') || ($toUOM == 'fah')) { if (($toUOM == 'F') || ($toUOM == 'fah')) {