vcl/win/gdi/winlayout.cxx | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit c0843884a0929ae4e5ad30e2410d8a8f6dfb1670
Author: krishna keshav <princy.krishnakes...@gmail.com>
Date: Mon May 30 02:17:22 2016 +0530
tdf#96099 Reduce number of typedefs used for trivial container types
Removed "typedef" for std::unordered_map<int, int> in
vcl/win/gdi/winlayout.cxx
Change-Id: I2798a21be61d6ceee680762d4145a2ae1fc1242d
Reviewed-on: https://gerrit.libreoffice.org/25644
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 7133a7c..76900a5 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -50,8 +50,6 @@
#include <unordered_map>
#include <unordered_set>
-typedef std::unordered_map<int,int> IntMap;
-
// Graphite headers
#include <config_graphite.h>
#if ENABLE_GRAPHITE
@@ -233,10 +231,10 @@ public:
}
private:
- IntMap maWidthMap;
- mutable int mnMinKashidaWidth;
- mutable int mnMinKashidaGlyph;
- bool mbGLyphySetupCalled;
+ std::unordered_map<int, int> maWidthMap;
+ mutable int mnMinKashidaWidth;
+ mutable int mnMinKashidaGlyph;
+ bool mbGLyphySetupCalled;
};
GLuint WinFontInstance::mnGLyphyProgram = 0;
@@ -345,7 +343,7 @@ inline void WinFontInstance::CacheGlyphWidth( int
nCharCode, int nCharWidth )
inline int WinFontInstance::GetCachedGlyphWidth( int nCharCode ) const
{
- IntMap::const_iterator it = maWidthMap.find( nCharCode );
+ auto it = maWidthMap.find( nCharCode );
if( it == maWidthMap.end() )
return -1;
return it->second;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
