diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-12-26 10:48:27 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-01-03 15:25:20 +0100 |
| commit | 351dee6b5343a910ee6fb6372bd0b2d9435517bd (patch) | |
| tree | 56db189b8ad1c24815c257d69be5f91734f8d0f7 /sw | |
| parent | fa9f3c7bb2c8c1df5d5b1dcb0d92f537753c72db (diff) | |
sal_uInt16 to more proper types, use while instead of for in simple cases
Change-Id: I5f3cc2771ccde44e1ea45b1ff3e7f8a3fedfb94a
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 2ada3837ce30..ea90350fbc03 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -153,7 +153,7 @@ static void lcl_html_outEvents( SvStream& rStrm, OUString sMethod( pDescs[i].EventMethod ); const sal_Char *pOpt = 0; - for( sal_uInt16 j=0; aEventListenerTable[j]; j++ ) + for( int j=0; aEventListenerTable[j]; j++ ) { if( sListener.equalsAscii( aEventListenerTable[j] ) && sMethod.equalsAscii( aEventMethodTable[j] ) ) @@ -215,12 +215,11 @@ static bool lcl_html_isHTMLControl( sal_Int16 nClassId ) bool SwHTMLWriter::HasControls() const { sal_uInt32 nStartIdx = pCurPam->GetPoint()->nNode.GetIndex(); - sal_uInt16 i; + size_t i = 0; // Skip all controls in front of the current paragraph - for( i = 0; i < aHTMLControls.size() && - aHTMLControls[i]->nNdIdx < nStartIdx; i++ ) - ; + while ( i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx < nStartIdx ) + ++i; return i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx == nStartIdx; } @@ -247,10 +246,9 @@ void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd ) : pCurPam->GetPoint()->nNode.GetIndex(); // Ueberspringen von Controls vor dem interesanten Bereich - sal_uInt16 i; - for( i = 0; i < aHTMLControls.size() && - aHTMLControls[i]->nNdIdx < nStartIdx; i++ ) - ; + size_t i = 0; + while ( i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx < nStartIdx ) + ++i; if( !pStartNd ) { @@ -1332,11 +1330,11 @@ void SwHTMLWriter::GetControls() // und VCForm in einem Array gemerkt. // Ueber dieses Array laesst sich dann feststellen, wo form::Forms geoeffnet // und geschlossen werden muessen. - sal_uInt16 i; + if( pHTMLPosFlyFrms ) { // die absatz-gebundenen Controls einsammeln - for( i=0; i<pHTMLPosFlyFrms->size(); i++ ) + for( size_t i=0; i<pHTMLPosFlyFrms->size(); i++ ) { const SwHTMLPosFlyFrm* pPosFlyFrm = (*pHTMLPosFlyFrms)[ i ]; if( HTML_OUT_CONTROL != pPosFlyFrm->GetOutFn() ) @@ -1354,7 +1352,7 @@ void SwHTMLWriter::GetControls() // und jetzt die in einem zeichengebundenen Rahmen const SwFrmFmts* pSpzFrmFmts = pDoc->GetSpzFrmFmts(); - for( i=0; i<pSpzFrmFmts->size(); i++ ) + for( size_t i=0; i<pSpzFrmFmts->size(); i++ ) { const SwFrmFmt *pFrmFmt = (*pSpzFrmFmts)[i]; if( RES_DRAWFRMFMT != pFrmFmt->Which() ) |