diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-11-07 12:38:43 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-11-07 12:38:43 +0000 |
| commit | 938bb7fde8e6b02794d326f4d83926b39eb29105 (patch) | |
| tree | 61644329f4839205a698b85ba0ee5b5e7a95f8b0 | |
| parent | 59fa7888cbe4dfdd3dd6fbe2526b84c5396fef3f (diff) | |
use min/max from stl
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 19a4cfb9afb0..83e42a99bdf5 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfrm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2000-10-25 13:04:40 $ + * last change: $Author: hjs $ $Date: 2000-11-07 13:38:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,9 @@ * ************************************************************************/ +#include <string> +#include <algorithm> + #ifdef PRECOMPILED #include "core_pch.hxx" #endif @@ -1154,7 +1157,7 @@ BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) const text::TextColumn* pArray = aSetColumns.getConstArray(); aColumns.DeleteAndDestroy(0, aColumns.Count()); //max. Count ist hier 64K - das kann das Array aber nicht - sal_uInt16 nCount = min((sal_uInt16)aSetColumns.getLength(), 0x3fff); + sal_uInt16 nCount = std::min((sal_uInt16)aSetColumns.getLength(), (sal_uInt16) 0x3fff); sal_uInt16 nWidthSum = 0; for(sal_uInt16 i = 0; i < nCount; i++) { |