summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-26 15:45:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-26 15:46:02 +0100
commitf76ecc3e9ce51b35fc18db55b808270079a3652b (patch)
tree4c17fe1216785465789ed893e938deaae8eb720d /vcl/source
parent85fae98f01250a6e9d75e841e0de410f8ea8a333 (diff)
Resolves: tdf#89231 if no font has 0x202F fallback to a normal space
Change-Id: I2325c0b09ccf66ee15597251ad027b295de5502f
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/outdev/font.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 40bd5cd47e36..216c8a6f8fcd 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2104,7 +2104,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
if( nFallbackLevel < MAX_FALLBACK-1)
{
// ignore fallback font if it is the same as the original font
- if( mpFontEntry->maFontSelData.mpFontData == aFontSelData.mpFontData )
+ // unless we are looking for a substituion for 0x202F, in which
+ // case we'll just use a normal space
+ if( mpFontEntry->maFontSelData.mpFontData == aFontSelData.mpFontData &&
+ aMissingCodes.indexOf(0x202F) == -1 )
{
mpFontCache->Release( pFallbackFont );
continue;