[Libreoffice-commits] core.git: vcl/inc

[krishna keshav]

 vcl/inc/graphite_layout.hxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 6d29b6d80aef8b94cd8ef0608c2af31532afc942
Author: krishna keshav <princy.krishnakeshav at gmail.com>
Date:   Mon May 30 01:59:49 2016 +0530

    tdf#96099 Reduce number of typedefs used for trivial container types
    
    Change-Id: If4678b6e4b6e0724c50415679bb7188d900b5eba
    Reviewed-on: https://gerrit.libreoffice.org/25643
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index a3076f4..75a38db 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -46,8 +46,7 @@ namespace grutils { class GrFeatureParser; }
 class GraphiteFaceWrapper
 {
 public:
-    typedef std::pair<int, int> GrFontMapKey;
-    typedef std::map<GrFontMapKey, gr_font*> GrFontMap;
+    typedef std::map<std::pair<int, int>, gr_font*> GrFontMap;
     GraphiteFaceWrapper(gr_face * pFace) : m_pFace(pFace) {}
     ~GraphiteFaceWrapper()
     {
@@ -61,7 +60,7 @@ public:
     gr_font * font(int ppm, bool isBold, bool isItalic) const
     {
         int styleKey = int(isBold) | (int(isItalic) << 1);
-        GrFontMap::const_iterator i = m_fonts.find(GrFontMapKey(ppm, styleKey));
+        GrFontMap::const_iterator i = m_fonts.find(std::pair<int, int>(ppm, styleKey));
         if (i != m_fonts.end())
             return i->second;
         return nullptr;
@@ -69,7 +68,7 @@ public:
     void addFont(int ppm, gr_font * pFont, bool isBold, bool isItalic)
     {
         int styleKey = int(isBold) | (int(isItalic) << 1);
-        GrFontMapKey key(ppm, styleKey);
+        std::pair<int, int> key(ppm, styleKey);
         if (m_fonts[key])
             gr_font_destroy(m_fonts[key]);
         m_fonts[key] = pFont;