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

[Caolán McNamara]

 stoc/source/typeconv/convert.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 266fa9f4f7bd536967c0430b67b203496930e250
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jun 24 12:04:33 2014 +0100

    fVal->nVal
    
    Change-Id: Ia5b041094f29e42cb60f2c83888cace42b91cc13

diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 1a6a081..3a0e127 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -391,15 +391,15 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, 
sal_Int64 min, sal_uInt6
     // STRING
     case TypeClass_STRING:
     {
-        sal_Int64 fVal = SAL_CONST_INT64(0);
-        if (! getHyperValue( fVal, *(OUString const *)rAny.getValue() ))
+        sal_Int64 nVal = SAL_CONST_INT64(0);
+        if (! getHyperValue( nVal, *(OUString const *)rAny.getValue() ))
         {
             throw CannotConvertException(
                 "invalid STRING value!",
                 Reference<XInterface>(), aDestinationClass, 
FailReason::IS_NOT_NUMBER, 0 );
         }
-        nRet = fVal;
-        if (fVal >= min && (fVal < 0 || ((sal_uInt64)fVal) <= max))
+        nRet = nVal;
+        if (nVal >= min && (nVal < 0 || ((sal_uInt64)nVal) <= max))
             return nRet;
         throw CannotConvertException(
             "STRING value out of range!",
commit a1b89677b79aa17db78e8eee010dea280c0f92a0
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jun 24 12:01:55 2014 +0100

    coverity#982255 Operands don't affect result
    
    fVal started out as a double, but is now a sal_Int64 since
    
     commit 353607df2ed59f00ad67a74de29b3db662ea960a
     Author: Lars Langhans <l...@openoffice.org>
     Date:   Mon Oct 9 13:21:27 2000 +0000
        #79269# convert to hyper doesn't use toDouble any longer
    
    so the comparison is always false
    
    Change-Id: Ib0b0a78ba3763fb6564219e69111de13b5afc870

diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index d04621f..1a6a081 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -398,7 +398,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, 
sal_Int64 min, sal_uInt6
                 "invalid STRING value!",
                 Reference<XInterface>(), aDestinationClass, 
FailReason::IS_NOT_NUMBER, 0 );
         }
-        nRet = (fVal > SAL_INT64_MAX ? (sal_Int64)(sal_uInt64)fVal : 
(sal_Int64)fVal);
+        nRet = fVal;
         if (fVal >= min && (fVal < 0 || ((sal_uInt64)fVal) <= max))
             return nRet;
         throw CannotConvertException(

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits