diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-09-17 11:47:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-17 11:47:40 +0100 |
| commit | f91e008c986b1d57c092103f1b68e75805499a59 (patch) | |
| tree | e8cd62ff0462ff5ba149473e5ccedc5dea60e976 /vcl/generic/glyphs/gcach_layout.cxx | |
| parent | e8b79f29a66b0528ad9ba2023930d3ba23915022 (diff) | |
older icu's appear to have the features, but not the typedefs
Change-Id: Ic17ffb49e7f143366c9c200d1c04b0536f2222b4
Diffstat (limited to 'vcl/generic/glyphs/gcach_layout.cxx')
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index ab008b20fba5..7d0cd9e67faa 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -312,10 +312,17 @@ static bool lcl_CharIsJoiner(sal_Unicode cChar) bool IcuLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) { le_int32 nLayoutFlags = 0; +#if (U_ICU_VERSION_MAJOR_NUM > 4) if (rArgs.mnFlags & SAL_LAYOUT_KERNING_PAIRS) nLayoutFlags |= LayoutEngine::kTypoFlagKern; if (rArgs.mnFlags & SAL_LAYOUT_ENABLE_LIGATURES) nLayoutFlags |= LayoutEngine::kTypoFlagLiga; +#else + if (rArgs.mnFlags & SAL_LAYOUT_KERNING_PAIRS) + nLayoutFlags |= 0x01; + if (rArgs.mnFlags & SAL_LAYOUT_ENABLE_LIGATURES) + nLayoutFlags |= 0x10; +#endif LEUnicode* pIcuChars; if( sizeof(LEUnicode) == sizeof(*rArgs.mpStr) ) |