[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6ad72c9c613766aabc15abaa676f5647b724b12b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 9 12:51:08 2016 +0100

    reported abs narrowing complaint
    
    Change-Id: Icd27fea97e720607263e5f8a2d233c462f979e1b
    (cherry picked from commit f75ead4293d3b9d63f2596d66c411c44c0c70f38)

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 83a4e8a..a31a2ae 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -75,6 +75,9 @@
 #  include <cstdio>
 #endif
 
+#include <cstdlib>
+#include <cmath>
+
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -2660,7 +2663,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
         if (aEvent.mnDelta == 0)
             aEvent.mnDelta = aEvent.mnNotchDelta;
         aEvent.mbHorz = true;
-        aEvent.mnScrollLines = abs(aEvent.mnDelta) / 40;
+        aEvent.mnScrollLines = std::abs(aEvent.mnDelta) / 40;
         if (aEvent.mnScrollLines == 0)
             aEvent.mnScrollLines = 1;
 
@@ -2674,7 +2677,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
         if (aEvent.mnDelta == 0)
             aEvent.mnDelta = aEvent.mnNotchDelta;
         aEvent.mbHorz = false;
-        aEvent.mnScrollLines = abs(aEvent.mnDelta) / 40;
+        aEvent.mnScrollLines = std::abs(aEvent.mnDelta) / 40;
         if (aEvent.mnScrollLines == 0)
             aEvent.mnScrollLines = 1;