[Libreoffice-commits] core.git: include/sal vcl/source

[Takeshi Abe]

 include/sal/macros.h      |    4 ----
 vcl/source/gdi/gdimtf.cxx |    5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit b55c205460fe7e7b133e179cd567764df7ac3508
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Dec 20 20:39:37 2016 +0900

    [API CHANGE] Retire SAL_ABS
    
    which had served since d441fa1f8cc0a17a2bc166bf2f2a44f76b83a773;
    we now have polymorhpic std::abs.
    
    Change-Id: Ibe48ac51508f7d9f5a44d712550237db7f553df3
    Reviewed-on: https://gerrit.libreoffice.org/32225
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/sal/macros.h b/include/sal/macros.h
index e5d2338..2e5a4b9 100644
--- a/include/sal/macros.h
+++ b/include/sal/macros.h
@@ -52,10 +52,6 @@
 #    define SAL_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
 #endif
 
-#ifndef SAL_ABS
-#    define SAL_ABS(a)              (((a) < 0) ? (-(a)) : (a))
-#endif
-
 #ifndef SAL_STRINGIFY
 #   define SAL_STRINGIFY_ARG(x) #x
 #   define SAL_STRINGIFY(x) SAL_STRINGIFY_ARG(x)
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 304ce21..e70f4d22 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/crc.h>
+#include <cstdlib>
 #include <memory>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
@@ -611,7 +612,7 @@ bool GDIMetaFile::Mirror( BmpMirrorFlags nMirrorFlags )
 
     if( nMirrorFlags & BmpMirrorFlags::Horizontal )
     {
-        nMoveX = SAL_ABS( aOldPrefSize.Width() ) - 1;
+        nMoveX = std::abs( aOldPrefSize.Width() ) - 1;
         fScaleX = -1.0;
     }
     else
@@ -622,7 +623,7 @@ bool GDIMetaFile::Mirror( BmpMirrorFlags nMirrorFlags )
 
     if( nMirrorFlags & BmpMirrorFlags::Vertical )
     {
-        nMoveY = SAL_ABS( aOldPrefSize.Height() ) - 1;
+        nMoveY = std::abs( aOldPrefSize.Height() ) - 1;
         fScaleY = -1.0;
     }
     else