Kaydet (Commit) e964042c authored tarafından Noel Grandin's avatar Noel Grandin

fix Win build

after my commit 7a0af379
"convert SAL_LAYOUT flags to scoped enum"

Change-Id: Iba12d2f60840a012d3e54a1364b672820e8bd6dc
üst bc56da87
...@@ -264,7 +264,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) ...@@ -264,7 +264,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
{ {
// prepare layout // prepare layout
// TODO: fix case when recyclying old SimpleWinLayout object // 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; mnCharCount = rArgs.mnEndCharPos - rArgs.mnMinCharPos;
if( !mbDisableGlyphs ) if( !mbDisableGlyphs )
...@@ -291,7 +291,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) ...@@ -291,7 +291,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
int i, j; int i, j;
mnGlyphCount = 0; 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 // count the number of chars to process if no RTL run
rArgs.ResetPos(); rArgs.ResetPos();
...@@ -1071,14 +1071,14 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) ...@@ -1071,14 +1071,14 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
// prepare itemization // prepare itemization
// TODO: try to avoid itemization since it costs a lot of performance // 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}; SCRIPT_STATE aScriptState = {0,false,false,false,false,false,false,false,false,0,0};
aScriptState.uBidiLevel = (0 != (rArgs.mnFlags & SalLayoutFlags::BiDiRtl)); aScriptState.uBidiLevel = bool(rArgs.mnFlags & SalLayoutFlags::BiDiRtl);
aScriptState.fOverrideDirection = (0 != (rArgs.mnFlags & SalLayoutFlags::BidiStrong)); aScriptState.fOverrideDirection = bool(rArgs.mnFlags & SalLayoutFlags::BidiStrong);
aScriptState.fDigitSubstitute = (0 != (rArgs.mnFlags & SalLayoutFlags::SubstituteDigits)); aScriptState.fDigitSubstitute = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
aScriptState.fArabicNumContext = aScriptState.fDigitSubstitute & aScriptState.uBidiLevel; aScriptState.fArabicNumContext = aScriptState.fDigitSubstitute & aScriptState.uBidiLevel;
DWORD nLangId = 0; // TODO: get language from font DWORD nLangId = 0; // TODO: get language from font
SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0}; SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0};
aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection; aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
aScriptControl.fContextDigits = (0 != (rArgs.mnFlags & SalLayoutFlags::SubstituteDigits)); aScriptControl.fContextDigits = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
#if HAVE_FMERGENEUTRALITEMS #if HAVE_FMERGENEUTRALITEMS
aScriptControl.fMergeNeutralItems = true; aScriptControl.fMergeNeutralItems = true;
#endif #endif
...@@ -1265,7 +1265,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) ...@@ -1265,7 +1265,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
rVisualItem.IsRTL() ); rVisualItem.IsRTL() );
// don't bother to do a default layout in a fallback level // don't bother to do a default layout in a fallback level
if( 0 != (rArgs.mnFlags & SalLayoutFlags::ForFallback) ) if( rArgs.mnFlags & SalLayoutFlags::ForFallback )
continue; continue;
// the primitive layout engine is good enough for the default layout // the primitive layout engine is good enough for the default layout
......
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