[Libreoffice-commits] core.git: canvas/source

[Ryan McCoskrie]

 canvas/source/cairo/cairo_textlayout.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit bb92c93a964f71ce574ddd940be6821da50b7235
Author: Ryan McCoskrie <ryan.mccoskrie at gmail.com>
Date:   Mon Apr 18 09:32:02 2016 +1200

    - Removed the only-used-once FontLevelVector typedef
    
    Change-Id: I78bdd690cd80b7caee816b005790b0130dffefeb
    Reviewed-on: https://gerrit.libreoffice.org/24177
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 8bb4d46..4b4b260 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -349,8 +349,7 @@ namespace cairocanvas
 
         //Pull all the fonts we need to render the text
         typedef std::pair<SystemFontData,int> FontLevel;
-        typedef std::vector<FontLevel> FontLevelVector;
-        FontLevelVector aFontData;
+        std::vector<FontLevel> aFontData;
         SystemGlyphDataVector::const_iterator aGlyphIter=aSysLayoutData.rGlyphData.begin();
         const SystemGlyphDataVector::const_iterator aGlyphEnd=aSysLayoutData.rGlyphData.end();
         for( ; aGlyphIter != aGlyphEnd; ++aGlyphIter )
@@ -402,8 +401,8 @@ namespace cairocanvas
          **/
 
         // Loop through the fonts used and render the matching glyphs for each
-        FontLevelVector::const_iterator aFontDataIter = aFontData.begin();
-        const FontLevelVector::const_iterator aFontDataEnd = aFontData.end();
+        std::vector<FontLevel>::const_iterator aFontDataIter = aFontData.begin();
+        const std::vector<FontLevel>::const_iterator aFontDataEnd = aFontData.end();
         for( ; aFontDataIter != aFontDataEnd; ++aFontDataIter )
         {
             const SystemFontData &rSysFontData = aFontDataIter->first;