From d79f43d0bebbe7b1f8d68d50734737aea9fe839d Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 31 Oct 2016 16:53:50 +0200 Subject: [PATCH] Enable the new text layout engine by default The handful of bugs reported so far have been fixed, and I think it had enough basic testing to show that it is usable and can be switched on for wider testing. We can always revert back to the old engine if needed before or even during 5.3 series. The environment variable SAL_NO_COMMON_LAYOUT can be set to disable it at runtime. Change-Id: If319a0161897ec676d3123595944a0401c67b63f Reviewed-on: https://gerrit.libreoffice.org/30443 Reviewed-by: Khaled Hosny Tested-by: Khaled Hosny --- vcl/README.vars | 2 +- vcl/source/gdi/sallayout.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/README.vars b/vcl/README.vars index 10e6356951d1..d50a03b11a7e 100644 --- a/vcl/README.vars +++ b/vcl/README.vars @@ -6,7 +6,7 @@ SAL_USE_VCLPLUGIN - use a VCL plugin SAL_NO_NWF - disable native widgets SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only) SAL_FORCE_HC - force high-contrast mode -SAL_USE_COMMON_LAYOUT - use CommonSalLayout layout engine for text layout +SAL_NO_COMMON_LAYOUT - disable CommonSalLayout layout engine for text layout VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where we do direct painting VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index b865ff917a6e..2e09aaf45436 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -770,7 +770,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) bool SalLayout::UseCommonLayout() { - static bool bUse = getenv("SAL_USE_COMMON_LAYOUT") != nullptr; + static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr; return bUse; }