diff options
Diffstat (limited to 'svl/source/items/nranges.cxx')
-rw-r--r-- | svl/source/items/nranges.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index 813c1fec8ebd..3684a748db14 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -63,7 +63,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, /** <H3>Description</H3> - Creates an USHORT-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as + Creates an sal_uInt16-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as first range, 'nNull' as terminator or start of 2nd range and 'pArgs' as remaider. @@ -73,7 +73,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, { NUMTYPE nSize = 0, nIns = 0; - USHORT nCnt = 0; + sal_uInt16 nCnt = 0; SvNums aNumArr( 11, 8 ); aNumArr.Insert( nWh1, nCnt++ ); aNumArr.Insert( nWh2, nCnt++ ); @@ -232,20 +232,20 @@ SfxNumRanges::SfxNumRanges( const NUMTYPE* pArr ) //------------------------------------------------------------------------ -BOOL SfxNumRanges::operator==( const SfxNumRanges &rOther ) const +sal_Bool SfxNumRanges::operator==( const SfxNumRanges &rOther ) const { // Object pointers equal? if ( this == &rOther ) - return TRUE; + return sal_True; // Ranges pointers equal? if ( _pRanges == rOther._pRanges ) - return TRUE; + return sal_True; // Counts equal? NUMTYPE nCount = Count(); if ( nCount != rOther.Count() ) - return FALSE; + return sal_False; // Check arrays. NUMTYPE n = 0; @@ -253,12 +253,12 @@ BOOL SfxNumRanges::operator==( const SfxNumRanges &rOther ) const { // Elements at current position equal? if ( _pRanges[ n ] != rOther._pRanges[ n ] ) - return FALSE; + return sal_False; ++n; } - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -776,21 +776,21 @@ SfxNumRanges& SfxNumRanges::operator /= //------------------------------------------------------------------------ -BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const +sal_Bool SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const /** <H3>Description</H3> Determines if at least one range in 'rRanges' intersects with one range in '*this'. - TRUE, if there is at least one with: + sal_True, if there is at least one with: this->Contains( n ) && rRanges.Contains( n ) */ { // special cases: one is empty if ( rRanges.IsEmpty() || IsEmpty() ) - return FALSE; + return sal_False; // find at least one intersecting range const NUMTYPE *pRange1 = _pRanges; @@ -810,12 +810,12 @@ BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const // the ranges are overlappung else - return TRUE; + return sal_True; } while ( *pRange2 ); // no intersection found - return FALSE; + return sal_False; } //------------------------------------------------------------------------ @@ -834,7 +834,7 @@ NUMTYPE SfxNumRanges::Count() const //------------------------------------------------------------------------ -BOOL SfxNumRanges::Contains( NUMTYPE n ) const +sal_Bool SfxNumRanges::Contains( NUMTYPE n ) const /** <H3>Description</H3> @@ -844,7 +844,7 @@ BOOL SfxNumRanges::Contains( NUMTYPE n ) const { for ( NUMTYPE *pRange = _pRanges; *pRange && *pRange <= n; pRange += 2 ) if ( pRange[0] <= n && n <= pRange[1] ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } |