diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-21 15:18:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-21 18:05:02 +0200 |
| commit | b844f06b36cf9a6c1411861a08701c8f9be2af0d (patch) | |
| tree | 54b76161f052d77d52e890c712aea86e7852db54 /sw/source/core/fields | |
| parent | 5b89b1dd909f76154266cd51558e97152cff5f64 (diff) | |
fdo#48692: fix problems with large number of table cells:
SwSelBoxes containers are filled from SwTableSortBoxes in various
places, so adapt that to use size_t integers as well.
Change-Id: Ia55f020bb9ada94bb22802d9adabb055a22edd2f
Diffstat (limited to 'sw/source/core/fields')
| -rw-r--r-- | sw/source/core/fields/cellfml.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 102b1e23ee31..430067fbe292 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -346,8 +346,8 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, String& rNewStr, rNewStr += '('; bool bDelim = false; - for( sal_uInt16 n = 0; n < aBoxes.size() && - !pCalcPara->rCalc.IsCalcError(); ++n ) + for (size_t n = 0; n < aBoxes.size() && + !pCalcPara->rCalc.IsCalcError(); ++n) { const SwTableBox* pTblBox = aBoxes[n]; if ( pTblBox->getRowSpan() >= 1 ) @@ -869,14 +869,13 @@ String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd, return sTmp; } -sal_uInt16 SwTableFormula::GetBoxesOfFormula( const SwTable& rTbl, +void SwTableFormula::GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes ) { rBoxes.clear(); BoxNmToPtr( &rTbl ); ScanString( &SwTableFormula::_GetFmlBoxes, rTbl, &rBoxes ); - return rBoxes.size(); } void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& , @@ -956,7 +955,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox, break; // dann mal die Tabellenkoepfe raus: - for( sal_uInt16 n = 0; n < rBoxes.size(); ++n ) + for (size_t n = 0; n < rBoxes.size(); ++n) { pLine = rBoxes[n]->GetUpper(); while( pLine->GetUpper() ) |