diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-11-06 18:19:26 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-11-06 18:19:26 +0000 |
| commit | d6c51dd1bad3ec103868cefdeca0c468751aa2f8 (patch) | |
| tree | ba560008af9e7c97d704f64fd4091e085669aedd /svx/source/dialog/pagectrl.cxx | |
| parent | #78581#: WebDAV workaround removed (diff) | |
| download | core-d6c51dd1bad3ec103868cefdeca0c468751aa2f8.tar.gz core-d6c51dd1bad3ec103868cefdeca0c468751aa2f8.zip | |
use min/max from stl
Diffstat (limited to 'svx/source/dialog/pagectrl.cxx')
| -rw-r--r-- | svx/source/dialog/pagectrl.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 17d39e87621c..c9e6943a908e 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pagectrl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:01:10 $ + * last change: $Author: hjs $ $Date: 2000-11-06 19:19:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,9 @@ #include "pagectrl.hxx" #include "boxitem.hxx" +#include <string> +#include <algorithm> + // struct PageWindow_Impl ------------------------------------------------ struct PageWindow_Impl @@ -152,8 +155,8 @@ SvxPageWindow::~SvxPageWindow() void __EXPORT SvxPageWindow::Paint( const Rectangle& rRect ) { - Fraction aXScale( aWinSize.Width(), max( aSize.Width() * 2 + aSize.Width() / 8, 1 ) ); - Fraction aYScale( aWinSize.Height(), max( aSize.Height(), 1 ) ); + Fraction aXScale( aWinSize.Width(), std::max( aSize.Width() * 2 + aSize.Width() / 8, 1 ) ); + Fraction aYScale( aWinSize.Height(), std::max( aSize.Height(), 1L ) ); MapMode aMapMode( GetMapMode() ); if ( aYScale < aXScale ) |