[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/tool/interpr3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b0cba8c2cd672b0d5a59a215961c5136a6e656b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 22 11:40:43 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 22 14:40:39 2019 +0200

    -Wimplicit-int-float-conversion
    
    with clang trunk
    
    implicit conversion from 'unsigned long' to 'double' changes value from
    18446744073709551615 to 18446744073709551616
    [-Werror,-Wimplicit-int-float-conversion]
                    if (f < 1.0 || f > std::numeric_limits<SCSIZE>::max())
                                     ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Change-Id: Ief0eb55ed1ade9fb88f5749774790aebbb27e085
    Reviewed-on: https://gerrit.libreoffice.org/81319
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 3e41643e6c50..ae99d1a79ef6 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3656,7 +3656,7 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
             [](double f) {
                 f = rtl::math::approxFloor(f);
                 // Valid ranks are >= 1.
-                if (f < 1.0 || f > std::numeric_limits<SCSIZE>::max())
+                if (f < 1.0 || static_cast<SCSIZE>(f) > std::numeric_limits<SCSIZE>::max())
                     return static_cast<SCSIZE>(0);
                 return static_cast<SCSIZE>(f);
             });