diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:57:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:57:43 +0000 |
| commit | 1f697c1c91ba66dafd67292cd09b1201649553df (patch) | |
| tree | f08f24da013d7b06e24178bbea679b110277550b /tools | |
| parent | 5d43dade0c5a17cd55ac010981ef894d35bbad28 (diff) | |
INTEGRATION: CWS hr51 (1.6.16); FILE MERGED
2008/06/06 14:13:38 hr 1.6.16.1: #i88947#: includes; namespaces
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/generic/line.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index 87a333938f4c..57b4c8d3fb61 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: line.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -37,7 +37,8 @@ #include <tools/debug.hxx> #include <cstdlib> -#include <cmath> +#include <cmath> // std::sqrt +#include <math.h> // hypot, doens't seem to live in std namespace everywhere inline long FRound( double fVal ) { @@ -238,7 +239,7 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const fDist *= -1.0; } else if( fR <= 1.0 ) - fDist = fS * sqrt( fL2 ); + fDist = fS * std::sqrt( fL2 ); else { fDist = hypot( maEnd.X() - rPtX, maEnd.Y() - rPtY ); |