[Libreoffice-commits] core.git: sw/source

[Vasily Melenchuk]

 sw/source/core/doc/DocumentStylePoolManager.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8418de72f592daae87a385f105519d637dfa4841
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
Date:   Tue Mar 24 11:03:51 2015 +0300

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index c9a2638..f9cb786 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;