[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/generic

[Thorsten Behrens]

 vcl/generic/glyphs/gcach_layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4090d9f9bfa7fbe9b25147f3c661c99714e83a6
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Wed May 28 00:48:49 2014 +0200

    Fix build to work with older harfbuzz versions.
    
    Whee, seems hb has changed naming, with 0.9.11 it is spelled as
    quoted. newer versions have a mapping in hb-deprecated.h ...
    
    Change-Id: I425ded33e6b9928aadca9f6988437a021fcecbfb
    (cherry picked from commit b3911e8adb34c6ee72577e58658b2cb72c6e79a3)

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index cbf3f9c..3f065bb 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -420,7 +420,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
 
             static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 
-            int nHbFlags = HB_BUFFER_FLAG_DEFAULT;
+            int nHbFlags = HB_BUFFER_FLAGS_DEFAULT;
             if (nMinRunPos == 0)
                 nHbFlags |= HB_BUFFER_FLAG_BOT; /* Beginning-of-text */
             if (nEndRunPos == rArgs.mnLength)