commit d3d13140f0036c53aa74820b41acfeffa3572168
author Stephan Bergmann <sbergman@redhat.com> Wed Aug 14 11:20:04 2019 +0200
committer Stephan Bergmann <sbergman@redhat.com> Wed Aug 14 13:56:29 2019 +0200
tree 82b2908783a7a08ed243b83ac62b40e2ee34aeff
parent 9c8854b7d6e5c9debc7eeae57c0d51a3f151a03e

tdf#126912: Fix convertsToAtLeast/Most mismatch

...introduced with 2abea7b8799f20ae2f47bb9f938670dea4f4f09f "Fix Clang 10
-Werror,-Wimplicit-int-float-conversion"

Change-Id: Ic1eb21e61695177729305e429a5f17daadaab9ae
Reviewed-on: https://gerrit.libreoffice.org/77447
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

vcl/source/window/window2.cxx

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 16f202e..3a6e470 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -600,9 +600,9 @@ static void lcl_HandleScrollHelper( ScrollBar* pScrl, double nN, bool isMultiply

            const double fVal = nNewPos - nN;

            if ( !o3tl::convertsToAtMost(fVal, LONG_MIN) )
            if ( !o3tl::convertsToAtLeast(fVal, LONG_MIN) )
                nNewPos = LONG_MIN;
            else if ( !o3tl::convertsToAtLeast(fVal, LONG_MAX) )
            else if ( !o3tl::convertsToAtMost(fVal, LONG_MAX) )
                nNewPos = LONG_MAX;
            else
                nNewPos = static_cast<long>(fVal);