diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-20 10:01:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 10:03:57 +0200 |
| commit | e964042c16efafd5f6656dbb7cea14c852a39822 (patch) | |
| tree | 3a417f4ab309f90fbb07c00a03d21b7a595ff675 /vcl | |
| parent | bc56da8784a76e92878193baf4764c50333eb21f (diff) | |
fix Win build
after my commit 7a0af37989d1f1b508a61f28e785c5b1f27d58af
"convert SAL_LAYOUT flags to scoped enum"
Change-Id: Iba12d2f60840a012d3e54a1364b672820e8bd6dc
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 4de04377a159..a231a2f0321d 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -264,7 +264,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) { // prepare layout // TODO: fix case when recyclying old SimpleWinLayout object - mbDisableGlyphs |= ((rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) != 0); + mbDisableGlyphs |= bool(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing); mnCharCount = rArgs.mnEndCharPos - rArgs.mnMinCharPos; if( !mbDisableGlyphs ) @@ -291,7 +291,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) int i, j; mnGlyphCount = 0; - bool bVertical = (rArgs.mnFlags & SalLayoutFlags::Vertical) != 0; + bool bVertical(rArgs.mnFlags & SalLayoutFlags::Vertical); // count the number of chars to process if no RTL run rArgs.ResetPos(); @@ -1071,14 +1071,14 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) // prepare itemization // 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 = (0 != (rArgs.mnFlags & SalLayoutFlags::BiDiRtl)); - aScriptState.fOverrideDirection = (0 != (rArgs.mnFlags & SalLayoutFlags::BidiStrong)); - aScriptState.fDigitSubstitute = (0 != (rArgs.mnFlags & SalLayoutFlags::SubstituteDigits)); + aScriptState.uBidiLevel = bool(rArgs.mnFlags & SalLayoutFlags::BiDiRtl); + 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 SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0}; aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection; - aScriptControl.fContextDigits = (0 != (rArgs.mnFlags & SalLayoutFlags::SubstituteDigits)); + aScriptControl.fContextDigits = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits); #if HAVE_FMERGENEUTRALITEMS aScriptControl.fMergeNeutralItems = true; #endif @@ -1265,7 +1265,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) rVisualItem.IsRTL() ); // don't bother to do a default layout in a fallback level - if( 0 != (rArgs.mnFlags & SalLayoutFlags::ForFallback) ) + if( rArgs.mnFlags & SalLayoutFlags::ForFallback ) continue; // the primitive layout engine is good enough for the default layout |