From b9160c2511287223d7e014de3134fde917b9320e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 28 Jan 2016 13:20:27 +0100 Subject: vcl: try to fix windows build There are at least 3 different definitions of SCRIPT_CONTROL, apparently newer versions of Windows SDK append flags at the end, so just initialize it with memset. Change-Id: I2e5f957bff1002629bf012e3effd3f1d281da3e1 --- vcl/win/gdi/winlayout.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vcl/win') diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 856f70d2729a..bc03845e3e7f 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -1695,7 +1695,9 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) 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,false,false,0}; + SCRIPT_CONTROL aScriptControl; + memset(&aScriptControl, 0, sizeof(aScriptControl)); + aScriptControl.uDefaultLanguage = nLangId; aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection; aScriptControl.fContextDigits = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits); aScriptControl.fMergeNeutralItems = true; -- cgit