diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2015-03-24 11:03:51 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-24 10:04:41 +0000 |
| commit | 8418de72f592daae87a385f105519d637dfa4841 (patch) | |
| tree | 1044bd88091e07072430baba2af9ef67a21ecac4 | |
| parent | 9b6b866c350f9900b3399214fcea550f282af2d0 (diff) | |
tdf#89783: sal_uInt16 replacement by size_t
These replacements allow LO to load, save and mail merge documents having
more than 65536 text frames in total.
Change-Id: I2a302a085c33f55c6b510fd80b5278268e0cdaa4
Reviewed-on: https://gerrit.libreoffice.org/14982
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/doc/DocumentStylePoolManager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index c9a2638c0c7c..f9cb786184bb 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -1110,7 +1110,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) OSL_ENSURE( nRCId, "invalid Id" ); while( nArrCnt-- ) - for( sal_uInt16 n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n ) + for( size_t n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n ) if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )-> GetPoolFmtId() ) { @@ -2141,7 +2141,7 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const { bFnd = false; while( nArrCnt-- && !bFnd ) - for( sal_uInt16 n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n ) + for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n ) if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )-> GetPoolFmtId() ) bFnd = true; |