diff options
Diffstat (limited to 'svl/source/items/whiter.cxx')
| -rw-r--r-- | svl/source/items/whiter.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx index ba8ddba9559e..b9fb9ca46330 100644 --- a/svl/source/items/whiter.cxx +++ b/svl/source/items/whiter.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "whiter.hxx" +#include <svl/whiter.hxx> #include <svl/itemset.hxx> DBG_NAME(SfxWhichIter) // ----------------------------------------------------------------------- -SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, USHORT nFromWh, USHORT nToWh ): +SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, sal_uInt16 nFromWh, sal_uInt16 nToWh ): pRanges(rSet.GetRanges()), pStart(rSet.GetRanges()), nOfst(0), nFrom(nFromWh), nTo(nToWh) @@ -55,19 +55,19 @@ SfxWhichIter::~SfxWhichIter() // ----------------------------------------------------------------------- -USHORT SfxWhichIter::NextWhich() +sal_uInt16 SfxWhichIter::NextWhich() { DBG_CHKTHIS(SfxWhichIter, 0); while ( 0 != *pRanges ) { - const USHORT nLastWhich = *pRanges + nOfst; + const sal_uInt16 nLastWhich = *pRanges + nOfst; ++nOfst; if (*(pRanges+1) == nLastWhich) { pRanges += 2; nOfst = 0; } - USHORT nWhich = *pRanges + nOfst; + sal_uInt16 nWhich = *pRanges + nOfst; if ( 0 == nWhich || ( nWhich >= nFrom && nWhich <= nTo ) ) return nWhich; } @@ -76,7 +76,7 @@ USHORT SfxWhichIter::NextWhich() // ----------------------------------------------------------------------- -USHORT SfxWhichIter::PrevWhich() +sal_uInt16 SfxWhichIter::PrevWhich() { DBG_CHKTHIS(SfxWhichIter, 0); while ( pRanges != pStart || 0 != nOfst ) @@ -87,7 +87,7 @@ USHORT SfxWhichIter::PrevWhich() pRanges -= 2; nOfst = *(pRanges+1) - (*pRanges); } - USHORT nWhich = *pRanges + nOfst; + sal_uInt16 nWhich = *pRanges + nOfst; if ( nWhich >= nFrom && nWhich <= nTo ) return nWhich; } @@ -96,7 +96,7 @@ USHORT SfxWhichIter::PrevWhich() // ----------------------------------------------------------------------- -USHORT SfxWhichIter::FirstWhich() +sal_uInt16 SfxWhichIter::FirstWhich() { DBG_CHKTHIS(SfxWhichIter, 0); pRanges = pStart; @@ -108,13 +108,13 @@ USHORT SfxWhichIter::FirstWhich() // ----------------------------------------------------------------------- -USHORT SfxWhichIter::LastWhich() +sal_uInt16 SfxWhichIter::LastWhich() { DBG_CHKTHIS(SfxWhichIter, 0); while(*pRanges) ++pRanges; nOfst = 0; - USHORT nWhich = *(pRanges-1); + sal_uInt16 nWhich = *(pRanges-1); if ( nWhich >= nFrom && nWhich <= nTo ) return nWhich; return PrevWhich(); |