[Libreoffice-commits] core.git: vcl/win

[Noel Grandin]

 vcl/win/source/gdi/winlayout.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b03f2cb6417c1f7a6892db23bcd3e807b2806e89
Author: Noel Grandin <noel at peralex.com>
Date:   Wed May 20 10:21:56 2015 +0200

    fix Win build
    
    after my commit 7a0af37989d1f1b508a61f28e785c5b1f27d58af
    "convert SAL_LAYOUT flags to scoped enum"
    
    Change-Id: I7494793aae482f0b687501ae199856b1a6640143

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a231a2f..d67fa1e 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);