mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[API CHANGE] Retire SAL_ABS

Browse Source 
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>
This commit is contained in:
Takeshi Abe
2016-12-20 20:39:37 +09:00
committed by Stephan Bergmann
parent c829e01e97
commit b55c205460
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sal/macros.h
View File

@@ -52,10 +52,6 @@
# define SAL_BOUND(x,l,h) ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x))) # define SAL_BOUND(x,l,h) ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
#endif #endif
#ifndef SAL_ABS
# define SAL_ABS(a) (((a) < 0) ? (-(a)) : (a))
#endif
#ifndef SAL_STRINGIFY #ifndef SAL_STRINGIFY
# define SAL_STRINGIFY_ARG(x) #x # define SAL_STRINGIFY_ARG(x) #x
# define SAL_STRINGIFY(x) SAL_STRINGIFY_ARG(x) # define SAL_STRINGIFY(x) SAL_STRINGIFY_ARG(x)

5
vcl/source/gdi/gdimtf.cxx
View File

@@ -18,6 +18,7 @@
*/ */
#include <rtl/crc.h> #include <rtl/crc.h>
#include <cstdlib>
#include <memory> #include <memory>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/vcompat.hxx> #include <tools/vcompat.hxx>
@@ -611,7 +612,7 @@ bool GDIMetaFile::Mirror( BmpMirrorFlags nMirrorFlags )
if( nMirrorFlags & BmpMirrorFlags::Horizontal ) if( nMirrorFlags & BmpMirrorFlags::Horizontal )
{ {
nMoveX = SAL_ABS( aOldPrefSize.Width() ) - 1; nMoveX = std::abs( aOldPrefSize.Width() ) - 1;
fScaleX = -1.0; fScaleX = -1.0;
} }
else else
@@ -622,7 +623,7 @@ bool GDIMetaFile::Mirror( BmpMirrorFlags nMirrorFlags )
if( nMirrorFlags & BmpMirrorFlags::Vertical ) if( nMirrorFlags & BmpMirrorFlags::Vertical )
{ {
nMoveY = SAL_ABS( aOldPrefSize.Height() ) - 1; nMoveY = std::abs( aOldPrefSize.Height() ) - 1;
fScaleY = -1.0; fScaleY = -1.0;
} }
else else