diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-20 19:45:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-20 19:46:40 +0200 |
| commit | 7092fc03000cd752fdadb9c6b800e631ee61115c (patch) | |
| tree | 805243698c14db45a64f5dac1bad89f50444b91c /sw | |
| parent | d69fdd1ed634be8426f9ff80f9411187da29f00a (diff) | |
adapt DBG_UTIL code to previous commit
Change-Id: I021b4d70a02de7a66e0af82a859ae89e1a7d1231
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/htmltbl.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 835e0cfafa06..4dea4f718a43 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1679,8 +1679,10 @@ void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail, // check if the tables have correct widths SwTwips nSize = pSwTable->GetFrmFmt()->GetFrmSize().GetWidth(); const SwTableLines& rLines = pSwTable->GetTabLines(); - for( sal_uInt16 n = 0; n < rLines.Count(); ++n ) + for (size_t n = 0; n < rLines.size(); ++n) + { _CheckBoxWidth( *rLines[ n ], nSize ); + } } #endif diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 8b1cb3d2dad9..0bbc13739194 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -196,7 +196,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #define CHECKBOXWIDTH \ { \ SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth(); \ - for( sal_uInt16 nTmp = 0; nTmp < aLines.Count(); ++nTmp ) \ + for (size_t nTmp = 0; nTmp < aLines.size(); ++nTmp) \ ::_CheckBoxWidth( *aLines[ nTmp ], nSize ); \ } @@ -721,12 +721,12 @@ sal_Bool SwTable::AppendRow( SwDoc* pDoc, sal_uInt16 nCnt ) // Find all Boxes/Lines _FndBox aFndBox( 0, 0 ); { - const SwTableLine* pLLine = GetTabLines().back(); + SwTableLine* pLLine = GetTabLines().back(); const SwSelBoxes* pBxs = 0; // Dummy!!! _FndPara aPara( *pBxs, &aFndBox ); - _FndBoxAppendRowLine( (SwTableLine*)pLLine, &aPara ); + _FndBoxAppendRowLine(pLLine, &aPara); } if( aFndBox.GetLines().empty() ) return sal_False; diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 277efde8a6d5..d106b489f9db 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1059,8 +1059,10 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, extern void _CheckBoxWidth( const SwTableLine&, SwTwips ); // checke doch mal ob die Tabellen korrekte Breiten haben SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth(); - for( sal_uInt16 n = 0; n < aLines.Count(); ++n ) + for (size_t n = 0; n < aLines.size(); ++n) + { _CheckBoxWidth( *aLines[ n ], nSize ); + } } #endif } |