diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-03 11:06:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-03 11:16:18 +0000 |
| commit | 4ef7c0de84ad9068a73d553557747f63fe6da264 (patch) | |
| tree | 441370507071412ac847e725862a4c083e1be7f2 /canvas | |
| parent | c7f3bf8c9eac84def2f5ae102dcfcad043583df0 (diff) | |
Related: fdo#31243 remove shadowed variable names
(cherry picked from commit 4a95223e49e5967472ff6ee68659c4ff87298e4d)
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index af022d4d066f..63a89e6f527f 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -417,14 +417,14 @@ namespace cairocanvas typedef std::pair<SystemFontData,int> FontLevel; typedef std::vector<FontLevel> FontLevelVector; FontLevelVector aFontData; - SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin(); - const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end(); - for( ; aIter != aEnd; ++aIter ) + SystemGlyphDataVector::const_iterator aGlyphIter=aSysLayoutData.rGlyphData.begin(); + const SystemGlyphDataVector::const_iterator aGlyphEnd=aSysLayoutData.rGlyphData.end(); + for( ; aGlyphIter != aGlyphEnd; ++aGlyphIter ) { - if( aFontData.empty() || aIter->fallbacklevel != aFontData.back().second ) + if( aFontData.empty() || aGlyphIter->fallbacklevel != aFontData.back().second ) { - aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aIter->fallbacklevel), - aIter->fallbacklevel)); + aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aGlyphIter->fallbacklevel), + aGlyphIter->fallbacklevel)); if( !isCairoRenderable(aFontData.back().first) ) { bCairoRenderable = false; @@ -477,11 +477,10 @@ namespace cairocanvas std::vector<cairo_glyph_t> cairo_glyphs; cairo_glyphs.reserve( 256 ); - SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin(); - const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end(); - for( ; aIter != aEnd; ++aIter ) + aGlyphIter=aSysLayoutData.rGlyphData.begin(); + for( ; aGlyphIter != aGlyphEnd; ++aGlyphIter ) { - SystemGlyphData systemGlyph = *aIter; + SystemGlyphData systemGlyph = *aGlyphIter; if( systemGlyph.fallbacklevel != aFontDataIter->second ) continue; |