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

[Tor Lillqvist]

 vcl/source/outdev/font.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ff66223fcb77e1d5263c777c001d0a42fcdba244
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 24 12:11:24 2015 +0200

    FONTFALLBACK_HOOKS_DISABLED is not defined
    
    Change-Id: Icaecbfe4c53c6488fe8d9ed797251ac23985706f

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 558ff3b..dc5f3c3 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2130,11 +2130,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
     for( int nFallbackLevel = 1; nFallbackLevel < MAX_FALLBACK; ++nFallbackLevel )
     {
         // find a font family suited for glyph fallback
-#ifndef FONTFALLBACK_HOOKS_DISABLED
         // GetGlyphFallbackFont() needs a valid aFontSelData.mpFontEntry
         // if the system-specific glyph fallback is active
         aFontSelData.mpFontEntry = mpFontEntry; // reset the fontentry to base-level
-#endif
+
         ImplFontEntry* pFallbackFont = mpFontCache->GetGlyphFallbackFont( mpFontCollection,
             aFontSelData, nFallbackLevel, aMissingCodes );
         if( !pFallbackFont )