[Libreoffice-commits] .: vcl/generic

[Libreoffice Gerrit user]

 vcl/generic/glyphs/gcach_layout.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit f91e008c986b1d57c092103f1b68e75805499a59
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 17 11:47:40 2012 +0100

    older icu's appear to have the features, but not the typedefs
    
    Change-Id: Ic17ffb49e7f143366c9c200d1c04b0536f2222b4

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index ab008b2..7d0cd9e 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) )