summaryrefslogtreecommitdiff
path: root/vcl/generic/glyphs/gcach_layout.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-15 11:05:45 +0200
committerNoel Grandin <noel@peralex.com>2015-05-20 09:52:08 +0200
commit7a0af37989d1f1b508a61f28e785c5b1f27d58af (patch)
tree758b9e8afed12bd028229c72bcb080264191219c /vcl/generic/glyphs/gcach_layout.cxx
parent78deb81c55266d37e35ff97fbb5b4086245d8ff2 (diff)
convert SAL_LAYOUT flags to scoped enum
Change-Id: I0aeea1f32136e43e90a1afb0ea84dbaff2b77587
Diffstat (limited to 'vcl/generic/glyphs/gcach_layout.cxx')
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 4a17997b6de2..bc65eafc8c89 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -56,13 +56,13 @@ void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
GenericSalLayout::AdjustLayout( rArgs );
// apply asian kerning if the glyphs are not already formatted
- if( (rArgs.mnFlags & SAL_LAYOUT_KERNING_ASIAN)
- && !(rArgs.mnFlags & SAL_LAYOUT_VERTICAL) )
+ if( (rArgs.mnFlags & SalLayoutFlags::KerningAsian)
+ && !(rArgs.mnFlags & SalLayoutFlags::Vertical) )
if( (rArgs.mpDXArray != NULL) || (rArgs.mnLayoutWidth != 0) )
ApplyAsianKerning( rArgs.mpStr, rArgs.mnLength );
// insert kashidas where requested by the formatting array
- if( (rArgs.mnFlags & SAL_LAYOUT_KASHIDA_JUSTIFICATON) && rArgs.mpDXArray )
+ if( (rArgs.mnFlags & SalLayoutFlags::KashidaJustification) && rArgs.mpDXArray )
{
int nKashidaIndex = mrServerFont.GetGlyphIndex( 0x0640 );
if( nKashidaIndex != 0 )
@@ -492,7 +492,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
if (!nGlyphIndex)
{
rLayout.SetNeedFallback(rArgs, nCharPos, bRightToLeft);
- if (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags)
+ if (SalLayoutFlags::ForFallback & rArgs.mnFlags)
continue;
}
@@ -580,7 +580,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
// determine need for kashida justification
if((rArgs.mpDXArray || rArgs.mnLayoutWidth)
&& ((maHbScript == HB_SCRIPT_ARABIC) || (maHbScript == HB_SCRIPT_SYRIAC)))
- rArgs.mnFlags |= SAL_LAYOUT_KASHIDA_JUSTIFICATON;
+ rArgs.mnFlags |= SalLayoutFlags::KashidaJustification;
return true;
}