WaE: fix up merge

canvas/source/cairo/cairo_textlayout.cxx

@@ -416,14 +416,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;
@@ -476,11 +476,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;