[Libreoffice-commits] core.git: 2 commits - scaddins/source

[Eike Rathke]

 scaddins/source/analysis/analysishelper.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 63153f10e0a7d16511878bbfcd97e2c8781a5564
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 5 15:44:02 2013 +0100

    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.

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 1b8fa1b..33c035f 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
commit 98f6e171e5f0a27c91dd61a7bcab18157d364413
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 5 15:43:14 2013 +0100

    Revert "Let precise things and put some references"
    
    This reverts commit fccf6cfdee7b63feb6deb96e9c8cd398c20b44a3.

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 1528dac..1b8fa1b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2546,8 +2546,8 @@ ConvertDataList::ConvertDataList( void )
 
     // PRESSURE: 1 Pascal is...
     NEWDP( "Pa",    1.0000000000000000E00,  CDC_Pressure ); // Pascal
-    NEWDP( "atm",   9.8692329999819300E-06, CDC_Pressure ); // Standard Atmosphere
-    NEWDP( "at",    1.0197162129779000E-05, CDC_Pressure ); // Technical Atmosphere -> http://physics.nist.gov/Pubs/SP811/appenB8.html
+    NEWDP( "atm",   9.8692329999819300E-06, CDC_Pressure ); // Atmosphere
+    NEWDP( "at",    1.0197162129779000E-05, 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