Kaydet (Commit) 8c173ce9 authored tarafından Khaled Hosny's avatar Khaled Hosny

DisableGlyphProcessing flag is never set now

Change-Id: I4a56c5d7490dd78f5cb72f2b821fb43c93f64b2d
Reviewed-on: https://gerrit.libreoffice.org/31223Reviewed-by: 's avatarKhaled Hosny <khaledhosny@eglug.org>
Tested-by: 's avatarKhaled Hosny <khaledhosny@eglug.org>
üst 0a2a7436
......@@ -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;
......
......@@ -75,7 +75,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs)
TEST(EnableLigatures);
TEST(SubstituteDigits);
TEST(KashidaJustification);
TEST(DisableGlyphProcessing);
TEST(ForFallback);
#undef TEST
s << "}";
......
......@@ -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
......
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment