From 8418de72f592daae87a385f105519d637dfa4841 Mon Sep 17 00:00:00 2001 From: Vasily Melenchuk Date: Tue, 24 Mar 2015 11:03:51 +0300 Subject: tdf#89783: sal_uInt16 replacement by size_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- sw/source/core/doc/DocumentStylePoolManager.cxx | 4 ++-- 1 file 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; -- cgit v1.2.3