diff options
| author | krishna keshav <princy.krishnakeshav@gmail.com> | 2016-05-30 01:59:49 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-03 10:59:10 +0000 |
| commit | 6d29b6d80aef8b94cd8ef0608c2af31532afc942 (patch) | |
| tree | 8260831c9817217d34a915591a8023fb8cf900ff | |
| parent | 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798 (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/inc/graphite_layout.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index a3076f4c8b9b..75a38db13ce0 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; |