diff options
| author | Eike Rathke <erack@redhat.com> | 2013-12-05 15:44:02 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-12-05 15:47:37 +0100 |
| commit | 63153f10e0a7d16511878bbfcd97e2c8781a5564 (patch) | |
| tree | 9ed527288846c89171c6a5d76bb812123f0b9406 | |
| parent | 98f6e171e5f0a27c91dd61a7bcab18157d364413 (diff) | |
Revert "Resolves: fdo#72174 convert_add from "at" or "atm" to "Pa" gives same answer"
This reverts commit c2dd0ef4b891a3d126dbe70ab5b76016b69d491c.
OpenFormula defined CONVERT after Excel that treats "at" and "atm" as
equivalent. Let's not come up with different factors here, even if
academically these two units c/would be different things.
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 1b8fa1b3edb7..33c035fa78b6 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2547,7 +2547,7 @@ ConvertDataList::ConvertDataList( void ) // PRESSURE: 1 Pascal is... NEWDP( "Pa", 1.0000000000000000E00, CDC_Pressure ); // Pascal NEWDP( "atm", 9.8692329999819300E-06, CDC_Pressure ); // Atmosphere - NEWDP( "at", 1.0197162129779000E-05, CDC_Pressure ); // Atmosphere also + NEWDP( "at", 9.8692329999819300E-06, CDC_Pressure ); // Atmosphere also NEWDP( "mmHg", 7.5006170799862700E-03, CDC_Pressure ); // mm Hg (Mercury) NEWD( "Torr", 7.5006380000000000E-03, CDC_Pressure ); // *** Torr NEWD( "psi", 1.4503770000000000E-04, CDC_Pressure ); // *** Psi |