diff options
-rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 6 | ||||
-rw-r--r-- | vcl/source/outdev/font.cxx | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index bc65eafc8c89..7bab5fe0d9f0 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -488,6 +488,12 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint; int32_t nCharPos = pHbGlyphInfos[i].cluster; + // tdf#89231 if it's just a missing non-breaking space, then use a normal space + if (!nGlyphIndex && (SalLayoutFlags::ForFallback & rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F) + { + nGlyphIndex = rFont.GetGlyphIndex(' '); + } + // if needed request glyph fallback by updating LayoutArgs if (!nGlyphIndex) { diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index a5e54e47056b..d4c77d520876 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; |