diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-28 22:52:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-29 14:57:44 +0200 |
| commit | ea8de68df5e7f4388bd7d9dea0bdbcf73c889875 (patch) | |
| tree | ef1a24204ef04d9357e8bff30beeda364a07f0e6 | |
| parent | 28f18b68db1af3668203730ba8cfbb66103fe669 (diff) | |
vcl: Vista implies usp10.dll >= 1.600
... claims https://en.wikipedia.org/wiki/Uniscribe - #ifdef this so it
can be removed when dropping XP support.
Change-Id: I9a51635cf9bb4876faf6dca011e6da9e1c2dc35d
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 454ecaecefa5..0572b2186f35 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -626,6 +626,7 @@ static bool bManualCellAlign = true; static void InitUSP() { +#if _WIN32_WINNT < _WIN32_WINNT_VISTA // get the usp10.dll version info HMODULE usp10 = GetModuleHandle("usp10.dll"); void *pScriptIsComplex = reinterpret_cast< void* >( GetProcAddress(usp10, "ScriptIsComplex")); @@ -655,7 +656,10 @@ static void InitUSP() // #i77976# USP>=1.0600 changed the need to manually align glyphs in their cells if( nUspVersion >= 10600 ) +#endif + { bManualCellAlign = false; + } bUspInited = true; } |