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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 24 10:57:21 UTC 2018


 vcl/inc/unx/glyphcache.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 91a70317a34826549ed2b1089b3a8e5b0200bdd6
Author:     Don Lewis <truckman at apache.org>
AuthorDate: Wed Aug 22 16:58:51 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 24 12:56:57 2018 +0200

    Fix int vs sal_GlyphId
    
    (cherry picked from commit 7b63e739fc22b8ade19cbd6fd5a343d0b457f751)
    
    Change-Id: Ic3606609bbdcaa07340b6a5d1cd7210ddd627ed7
    Reviewed-on: https://gerrit.libreoffice.org/59546
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 2d1caf537b9c..203fa031d8db 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -159,7 +159,7 @@ private:
 
     void                    ApplyGlyphTransform(bool bVertical, FT_Glyph) const;
 
-    typedef std::unordered_map<int,GlyphData> GlyphList;
+    typedef std::unordered_map<sal_GlyphId, GlyphData> GlyphList;
     mutable GlyphList       maGlyphList;
 
     rtl::Reference<FreetypeFontInstance> mpFontInstance;


More information about the Libreoffice-commits mailing list