summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-20 10:21:56 +0200
committerNoel Grandin <noel@peralex.com>2015-05-20 10:22:23 +0200
commitb03f2cb6417c1f7a6892db23bcd3e807b2806e89 (patch)
treea3d488e0a31582ff00f533ac636cf535a8463c00 /vcl
parent05c85d7a36f3ea69bba0fa69720bff61f2e0f573 (diff)
fix Win build
after my commit 7a0af37989d1f1b508a61f28e785c5b1f27d58af "convert SAL_LAYOUT flags to scoped enum" Change-Id: I7494793aae482f0b687501ae199856b1a6640143
Diffstat (limited to 'vcl')
-rw-r--r--vcl/win/source/gdi/winlayout.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a231a2f0321d..d67fa1e636c2 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1072,7 +1072,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
// TODO: try to avoid itemization since it costs a lot of performance
SCRIPT_STATE aScriptState = {0,false,false,false,false,false,false,false,false,0,0};
aScriptState.uBidiLevel = bool(rArgs.mnFlags & SalLayoutFlags::BiDiRtl);
- aScriptState.fOverrideDirection = bool(rArgs.mnFlags & SalLayoutFlags::BidiStrong);
+ aScriptState.fOverrideDirection = bool(rArgs.mnFlags & SalLayoutFlags::BiDiStrong);
aScriptState.fDigitSubstitute = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
aScriptState.fArabicNumContext = aScriptState.fDigitSubstitute & aScriptState.uBidiLevel;
DWORD nLangId = 0; // TODO: get language from font
@@ -1137,7 +1137,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
}
// reorder visual item order if needed
- if( rArgs.mnFlags & SalLayoutFlags::BidiStrong )
+ if( rArgs.mnFlags & SalLayoutFlags::BiDiStrong )
{
// force RTL item ordering if requested
if( rArgs.mnFlags & SalLayoutFlags::BiDiRtl )
@@ -1234,7 +1234,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
}
// override bidi analysis if requested
- if( rArgs.mnFlags & SalLayoutFlags::BidiStrong )
+ if( rArgs.mnFlags & SalLayoutFlags::BiDiStrong )
{
// FIXME: is this intended ?
rVisualItem.mpScriptItem->a.fRTL = (aScriptState.uBidiLevel & 1);