[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68b546b17afa0082862f2a20b8f089ae9124a16a
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Mar 10 16:53:08 2017 +0200

    tdf#106466: Use graphite2 shaper first
    
    We want to always prefer Graphite shaping when supported by the font,
    which is also what HarfBuzz does by default.
    
    Change-Id: I6670fc03b8e6b3d7e07e1b8e0062880524da1655
    Reviewed-on: https://gerrit.libreoffice.org/35046
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    (cherry picked from commit 3cee50476e422e3ed84169cdcbe6bd9883fc9316)
    Reviewed-on: https://gerrit.libreoffice.org/35058
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 21be0c99bf01..a6ca683c15f5 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -579,7 +579,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
             // preference. The coretext_aat shaper is available only on macOS,
             // but there is no harm in always including it, HarfBuzz will
             // ignore unavailable shapers.
-            const char* pHbShapers[] = { "coretext_aat", "graphite2", "ot", "fallback", nullptr };
+            const char* pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr };
             hb_segment_properties_t aHbProps;
             hb_buffer_get_segment_properties(pHbBuffer, &aHbProps);
             hb_shape_plan_t* pHbPlan = hb_shape_plan_create_cached(pHbFace, &aHbProps, maFeatures.data(), maFeatures.size(), pHbShapers);