diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:27:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:36:55 +0100 |
commit | b2371492dfd5c8003f89ed8acf3dbc690d6af8d0 (patch) | |
tree | 876a32c415fa06d41a51a2a4a9cc16b1e97bdf76 /vcl/source/window/toolbox.cxx | |
parent | 768ea2924680fc4beb75a782cb0faf26695fee53 (diff) |
Use cstdlib std::abs instead of stdlib.h abs
...because the latter lacks the abs(long) overload in some popular environments,
cf. <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60401> "stdlib.h does not
provide abs(long) overload."
Similarly, stdlib.h lacks the abs(float), abs(double), abs(long double)
overloads compared to cmath there, whose use was apparently intended in
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx. Rewrote that to use
CPPUNIT_ASSERT_DOUBLES_EQUAL instead, which revealed that the comparisons need
rather large deltas of .1 resp. .2 (which the original code hid with an
implicit conversion to integral type, thus using an effective delta of 1).
Discovered with -Wabsolute-value ("absolute value function 'abs' given an
argument of type 'long' but has parameter of type 'int' which may cause
truncation of value") recently introduced on Clang trunk towards 3.5.
Change-Id: I4c41575ffdccb2944498b662bd3a53fd510cb0c0
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
-rw-r--r-- | vcl/source/window/toolbox.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index f74950946f9a..77c0e3d1b9cb 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -45,6 +45,7 @@ #include <svsys.h> #endif +#include <cstdlib> #include <string.h> #include <vector> #include <math.h> @@ -2206,11 +2207,11 @@ Size ToolBox::ImplGetOptimalFloatingSize() return aSize2; // set the size with the smallest delta as the current size - long dx1 = abs( mnDX - aSize1.Width() ); - long dy1 = abs( mnDY - aSize1.Height() ); + long dx1 = std::abs( mnDX - aSize1.Width() ); + long dy1 = std::abs( mnDY - aSize1.Height() ); - long dx2 = abs( mnDX - aSize2.Width() ); - long dy2 = abs( mnDY - aSize2.Height() ); + long dx2 = std::abs( mnDX - aSize2.Width() ); + long dy2 = std::abs( mnDY - aSize2.Height() ); if( dx1*dy1 < dx2*dy2 ) aCurrentSize = aSize1; |