[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scaddins/source

Eike Rathke erack at redhat.com
Thu Dec 5 06:58:24 PST 2013


 scaddins/source/analysis/analysishelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 152ee33b6c70315e1103b12de745b3f9c675c0b2
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 5 15:57:50 2013 +0100

    Revert "Resolves: fdo#72174 convert_add from "at" or "atm" to "Pa" gives same answer"
    
    This reverts commit 4139dc70da04fe3d6a86bbab1e7bf6f11d812f04.

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index d5ff83b..d84dc39 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2541,7 +2541,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


More information about the Libreoffice-commits mailing list