diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-24 01:12:17 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:16 -0500 |
| commit | c06bb50a842e7681fb9c1325746cec92232f711c (patch) | |
| tree | 9a319319c3d652f6a4b1f6c2a518eee3dd02a529 | |
| parent | c54fef1a7cf17a12804f4fcf4ccfe042cfe8bb2c (diff) | |
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>
(cherry picked from commit 8c173ce9ba4d90770cd85b148fe3122a097396a7)
(cherry picked from commit c8faf047b50d0661e943f522b1a9777c1e81347d)
| -rw-r--r-- | include/vcl/outdev.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 13 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 18 |
4 files changed, 9 insertions, 26 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d00260781468..5e71bf1dcab9 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -141,13 +141,12 @@ enum class SalLayoutFlags EnableLigatures = 0x0200, SubstituteDigits = 0x0400, KashidaJustification = 0x0800, - DisableGlyphProcessing = 0x1000, ForFallback = 0x2000, DrawBullet = 0x4000, }; namespace o3tl { - template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x7f77> {}; + template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x6f77> {}; } typedef std::vector< Rectangle > MetricVector; diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 0034bca78b7a..92c5934b618e 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -77,7 +77,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) TEST(EnableLigatures); TEST(SubstituteDigits); TEST(KashidaJustification); - TEST(DisableGlyphProcessing); TEST(ForFallback); #undef TEST s << "}"; 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 diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 43fd6e4554cf..9d0fc990b30b 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -946,22 +946,12 @@ bool GenPspGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return false; } -SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +SalLayout* GenPspGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) { - if( nFallbackLevel > 0 ) - rArgs.mnFlags &= ~SalLayoutFlags::DisableGlyphProcessing; - - GenericSalLayout* pLayout = nullptr; - - if( m_pFreetypeFont[ nFallbackLevel ] - && !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) ) - { - pLayout = new PspCommonSalLayout(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]); - } + if (m_pFreetypeFont[nFallbackLevel]) + return new PspCommonSalLayout(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]); else - pLayout = new PspFontLayout( *m_pPrinterGfx ); - - return pLayout; + return new PspFontLayout(*m_pPrinterGfx); } bool GenPspGraphics::CreateFontSubset( |