Kaydet (Commit) c25ebf75 authored tarafından Matteo Casalin's avatar Matteo Casalin

MultiSelection::GetRangeCount() returns size_t

Change-Id: Ief072cef486556c9b43364e108a021510781f7c6
üst 3228cb20
...@@ -511,8 +511,8 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3 ...@@ -511,8 +511,8 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3
_rColumns.realloc( nCount ); _rColumns.realloc( nCount );
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
sal_uInt32 nRangeCount = pColumnSel->GetRangeCount(); const size_t nRangeCount = pColumnSel->GetRangeCount();
for( sal_uInt32 nRange = 0; nRange < nRangeCount; ++nRange ) for( size_t nRange = 0; nRange < nRangeCount; ++nRange )
{ {
const Range& rRange = pColumnSel->GetRange( nRange ); const Range& rRange = pColumnSel->GetRange( nRange );
// loop has to include aRange.Max() // loop has to include aRange.Max()
......
...@@ -535,10 +535,10 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor, ...@@ -535,10 +535,10 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
const sal_Int32 nIndx = GetInfo().GetIdx(); const sal_Int32 nIndx = GetInfo().GetIdx();
long nUnderStart = 0; long nUnderStart = 0;
long nUnderEnd = 0; long nUnderEnd = 0;
const MSHORT nCnt = (MSHORT)aUnderMulti.GetRangeCount(); const size_t nCnt = aUnderMulti.GetRangeCount();
// find the underline range the current portion is contained in // find the underline range the current portion is contained in
for( MSHORT i = 0; i < nCnt; ++i ) for( size_t i = 0; i < nCnt; ++i )
{ {
const Range& rRange = aUnderMulti.GetRange( i ); const Range& rRange = aUnderMulti.GetRange( i );
if( nUnderEnd == rRange.Min() ) if( nUnderEnd == rRange.Min() )
......
...@@ -687,8 +687,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) ...@@ -687,8 +687,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
CalcHiddenRanges( rNode, aHiddenMulti ); CalcHiddenRanges( rNode, aHiddenMulti );
aHiddenChg.clear(); aHiddenChg.clear();
sal_uInt16 i = 0; for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
for( i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{ {
const Range& rRange = aHiddenMulti.GetRange( i ); const Range& rRange = aHiddenMulti.GetRange( i );
const sal_Int32 nStart = rRange.Min(); const sal_Int32 nStart = rRange.Min();
...@@ -1159,7 +1158,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) ...@@ -1159,7 +1158,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
// check kashida data // check kashida data
long nTmpKashidaPos = -1; long nTmpKashidaPos = -1;
bool bWrongKash = false; bool bWrongKash = false;
for (i = 0; i < aKashida.size(); ++i ) for (size_t i = 0; i < aKashida.size(); ++i )
{ {
long nCurrKashidaPos = GetKashida( i ); long nCurrKashidaPos = GetKashida( i );
if ( nCurrKashidaPos <= nTmpKashidaPos ) if ( nCurrKashidaPos <= nTmpKashidaPos )
...@@ -1478,7 +1477,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo ...@@ -1478,7 +1477,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
: 0); : 0);
MultiSelection aHiddenMulti( aRange ); MultiSelection aHiddenMulti( aRange );
SwScriptInfo::CalcHiddenRanges( rNode, aHiddenMulti ); SwScriptInfo::CalcHiddenRanges( rNode, aHiddenMulti );
for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{ {
const Range& rRange = aHiddenMulti.GetRange( i ); const Range& rRange = aHiddenMulti.GetRange( i );
const sal_Int32 nHiddenStart = rRange.Min(); const sal_Int32 nHiddenStart = rRange.Min();
...@@ -1497,7 +1496,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo ...@@ -1497,7 +1496,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
if ( pList ) if ( pList )
{ {
for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i ) for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{ {
const Range& rRange = aHiddenMulti.GetRange( i ); const Range& rRange = aHiddenMulti.GetRange( i );
pList->push_back( rRange.Min() ); pList->push_back( rRange.Min() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment