summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-11-24 12:11:24 +0200
committerTor Lillqvist <tml@collabora.com>2015-11-24 12:38:58 +0200
commitff66223fcb77e1d5263c777c001d0a42fcdba244 (patch)
treee2831d246b54ee6ad03ed76e399413f7d007cfa6
parent70b09d932225027d531c9a95317320174f8ad687 (diff)
FONTFALLBACK_HOOKS_DISABLED is not defined
Change-Id: Icaecbfe4c53c6488fe8d9ed797251ac23985706f
-rw-r--r--vcl/source/outdev/font.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 558ff3b5eb55..dc5f3c30a4a3 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 )