diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-08 09:57:31 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-12 08:53:29 +0100 |
| commit | 557daa9c4b27a3c45c788c65d0c17ff2ffd088ff (patch) | |
| tree | 00f63f9bd0510bdd90d5ac823182f0870de50d51 /vcl/win/source | |
| parent | d0d9d7970bfb273fb9c7314439d029ecc4f042e0 (diff) | |
WaE: declaration shadows a previous local
Diffstat (limited to 'vcl/win/source')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 7b08ee819a40..0a9e8249d7f0 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -542,9 +542,9 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) mpCharWidths[ i ] = 0; for( i = 0; i < mnGlyphCount; ++i ) { - int j = mpGlyphs2Chars[ i ] - rArgs.mnMinCharPos; - if( j >= 0 ) - mpCharWidths[ j ] += mpGlyphAdvances[ i ]; + int k = mpGlyphs2Chars[ i ] - rArgs.mnMinCharPos; + if( k >= 0 ) + mpCharWidths[ k ] += mpGlyphAdvances[ i ]; } } @@ -1448,8 +1448,8 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) if( (rArgs.mnEndCharPos <= rVisualItem.mnMinCharPos) || (rArgs.mnMinCharPos >= rVisualItem.mnEndCharPos) ) { - for( int i = rVisualItem.mnMinCharPos; i < rVisualItem.mnEndCharPos; ++i ) - mpLogClusters[i] = sal::static_int_cast<WORD>(~0U); + for( int j = rVisualItem.mnMinCharPos; j < rVisualItem.mnEndCharPos; ++j ) + mpLogClusters[j] = sal::static_int_cast<WORD>(~0U); continue; } |