summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2015-03-18 11:48:50 +0300
committerCaolán McNamara <caolanm@redhat.com>2015-03-18 13:07:57 +0000
commitedbf82cbfc8d886db40b1b6e3d7b3ef84fddf604 (patch)
treec1339d42df207dc6dc044b2c577b0eef43ae6de1
parent34dc97c79165a038fd1262902a414fe78882aaba (diff)
tdf#89783: sal_uInt16 replacement by size_t
These replacements allow LO to load, save and mail merge documents having more than 65536 tables in total. Change-Id: Ic58f0f6f8cca3dcaa63b4488447b1fc9686677d0
-rw-r--r--sw/source/core/docnode/ndtbl.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index cb7aac3d60c7..98a854fddb41 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3870,8 +3870,8 @@ OUString SwDoc::GetUniqueTblName() const
ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
const OUString aName( aId );
- sal_uInt16 nNum, nTmp, nFlagSize = ( mpTblFrmFmtTbl->size() / 8 ) +2;
- sal_uInt16 n;
+ size_t nNum, nTmp, nFlagSize = ( mpTblFrmFmtTbl->size() / 8 ) + 2;
+ size_t n;
sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
memset( pSetFlags, 0, nFlagSize );
@@ -3914,7 +3914,7 @@ SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, bool bAll ) const
else
{
// Only the ones set in the Doc
- for( sal_uInt16 n = 0; n < mpTblFrmFmtTbl->size(); ++n )
+ for( size_t n = 0; n < mpTblFrmFmtTbl->size(); ++n )
{
const SwFrmFmt* pFmt = (*mpTblFrmFmtTbl)[ n ];
if( !pFmt->IsDefault() && IsUsed( *pFmt ) &&