diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-12-20 20:39:37 +0900 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 07:54:51 +0000 |
| commit | b55c205460fe7e7b133e179cd567764df7ac3508 (patch) | |
| tree | 1b18cd98bf1044e19a40ce4e4a298cb206626765 | |
| parent | c829e01e973ac32fb625925ce83f843ad30d94db (diff) | |
[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@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | include/sal/macros.h | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/sal/macros.h b/include/sal/macros.h index e5d233801295..2e5a4b9d3df3 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 304ce2112c85..e70f4d22769c 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 |