diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-24 01:12:17 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-26 10:57:07 +0000 |
| commit | 8c173ce9ba4d90770cd85b148fe3122a097396a7 (patch) | |
| tree | 90b9534e5f6a1d00767560f4ab8184e9fe9e07a2 /vcl/unx/generic/gdi/cairotextrender.cxx | |
| parent | Resolves: tdf#103493 copying note captions needs a completed destination sheet (diff) | |
| download | core-8c173ce9ba4d90770cd85b148fe3122a097396a7.tar.gz core-8c173ce9ba4d90770cd85b148fe3122a097396a7.zip | |
DisableGlyphProcessing flag is never set now
Change-Id: I4a56c5d7490dd78f5cb72f2b821fb43c93f64b2d
Reviewed-on: https://gerrit.libreoffice.org/31223
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/unx/generic/gdi/cairotextrender.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index ea5ab47d609e..5109470e8866 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -478,17 +478,12 @@ bool CairoTextRender::GetGlyphOutline( sal_GlyphId aGlyphId, return false; } -SalLayout* CairoTextRender::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +SalLayout* CairoTextRender::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) { - SalLayout* pLayout = nullptr; + if (mpFreetypeFont[nFallbackLevel]) + return new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]); - if( mpFreetypeFont[ nFallbackLevel ] - && !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) ) - { - pLayout = new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]); - } - - return pLayout; + return nullptr; } #if ENABLE_CAIRO_CANVAS |