diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:22:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:22:24 +0000 |
| commit | 8e4b86b646939f87a9098825b7d41982e17c4c32 (patch) | |
| tree | 404d735525db06c35e160ecaa5eee200fe77704f /svtools/source/items1 | |
| parent | ed571ec3f33127977eccf660bafb0a3a7e464eeb (diff) | |
INTEGRATION: CWS sb59 (1.3.300); FILE MERGED
2006/07/28 15:24:20 sb 1.3.300.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'svtools/source/items1')
| -rw-r--r-- | svtools/source/items1/nranges.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/svtools/source/items1/nranges.cxx b/svtools/source/items1/nranges.cxx index f215cdec7429..c0b12a1d2ece 100644 --- a/svtools/source/items1/nranges.cxx +++ b/svtools/source/items1/nranges.cxx @@ -4,9 +4,9 @@ * * $RCSfile: nranges.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 15:06:08 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:22:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,14 +80,18 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, */ { - NUMTYPE nSize = 0, nIns = 0, nCnt = 0; + NUMTYPE nSize = 0, nIns = 0; + USHORT nCnt = 0; SvNums aNumArr( 11, 8 ); aNumArr.Insert( nWh1, nCnt++ ); aNumArr.Insert( nWh2, nCnt++ ); DBG_ASSERT( nWh1 <= nWh2, "Ungueltiger Bereich" ); nSize += nWh2 - nWh1 + 1; aNumArr.Insert( nNull, nCnt++ ); - while ( 0 != ( nIns = va_arg( pArgs, NUMTYPE_ARG ) ) ) + while ( 0 != + ( nIns = + sal::static_int_cast< NUMTYPE >( + va_arg( pArgs, NUMTYPE_ARG ) ) ) ) { aNumArr.Insert( nIns, nCnt++ ); if ( 0 == (nCnt & 1) ) // 4,6,8, usw. @@ -207,7 +211,10 @@ SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNul { va_list pArgs; va_start( pArgs, nNull ); - InitializeRanges_Impl(_pRanges, pArgs, nWh0, nWh1, nNull); + InitializeRanges_Impl( + _pRanges, pArgs, sal::static_int_cast< NUMTYPE >(nWh0), + sal::static_int_cast< NUMTYPE >(nWh1), + sal::static_int_cast< NUMTYPE >(nNull)); DBG_CHECK_RANGES(NUMTYPE, _pRanges); } |