diff options
Diffstat (limited to 'tools/source/memtools/multisel.cxx')
| -rw-r--r-- | tools/source/memtools/multisel.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index 25599212b9a4..d671130bc650 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -607,14 +607,14 @@ bool StringRangeEnumerator::insertRange( sal_Int32 i_nFirst, sal_Int32 i_nLast, } bool StringRangeEnumerator::insertJoinedRanges( - const std::vector< sal_Int32 >& rNumbers, bool i_bStrict ) + const std::vector< sal_Int32 >& rNumbers ) { size_t nCount = rNumbers.size(); if( nCount == 0 ) return true; if( nCount == 1 ) - return insertRange( rNumbers[0], -1, false, ! i_bStrict ); + return insertRange( rNumbers[0], -1, false, true ); for( size_t i = 0; i < nCount - 1; i++ ) { @@ -626,8 +626,7 @@ bool StringRangeEnumerator::insertJoinedRanges( else if( nFirst < nLast ) nFirst++; } - if ( ! insertRange( nFirst, nLast, nFirst != nLast, ! i_bStrict ) && i_bStrict) - return false; + insertRange( nFirst, nLast, nFirst != nLast, true ); } return true; @@ -663,7 +662,7 @@ bool StringRangeEnumerator::setRange( const OUString& i_rNewRange ) { if( bSequence && !aNumbers.empty() ) aNumbers.push_back( mnMax ); - insertJoinedRanges( aNumbers, false/*i_bStrict*/ ); + insertJoinedRanges( aNumbers ); aNumbers.clear(); bSequence = false; @@ -677,7 +676,7 @@ bool StringRangeEnumerator::setRange( const OUString& i_rNewRange ) // insert last entries if( bSequence && !aNumbers.empty() ) aNumbers.push_back( mnMax ); - insertJoinedRanges( aNumbers, false/*i_bStrict*/ ); + insertJoinedRanges( aNumbers ); return true; } |