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

Eike Rathke erack at redhat.com
Mon Jun 1 02:16:16 PDT 2015


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

New commits:
commit d60f5f08343f818201ba6d74c94405d054e6c2f8
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jun 1 10:57:45 2015 +0200

    fix build break
    
    6feb828757477669325ebd8bc4491b7e4d1283dc used SalLayoutFlags enum
    value that aren't introduced yet on this branch.
    
    Change-Id: I64b30ad36a6812a3c2992d9185e816c1eba4642d

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index c51ee4a..af9830c 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -446,7 +446,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
                 int32_t nCharPos = pHbGlyphInfos[i].cluster;
 
                 // tdf#89231 if it's just a missing non-breaking space, then use a normal space
-                if (!nGlyphIndex && (SalLayoutFlags::ForFallback & rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
+                if (!nGlyphIndex && (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
                 {
                     nGlyphIndex = rFont.GetGlyphIndex(' ');
                 }


More information about the Libreoffice-commits mailing list