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

[Khaled Hosny]

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4c46c3046fb922f65b562e893e59d6b67ea5b2c2
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Nov 19 19:58:42 2016 +0200

    We don’t use this with the new layout engine
    
    Don’t wast time parsing GSUB table to populate a vector that we won’t
    use.
    
    Change-Id: I74dbb0f4d679cf06f22c1667899bcd3cae22c1d8

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 7ef42b8..e398257 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -508,7 +508,8 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI
 
     mbFaceOk = true;
 
-    ApplyGSUB( rFSD );
+    if (!SalLayout::UseCommonLayout())
+        ApplyGSUB( rFSD );
 
     // TODO: query GASP table for load flags
     mnLoadFlags = FT_LOAD_DEFAULT;