summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-11-01 02:25:10 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2016-11-01 02:25:10 +0200
commit3950166877bf1308f9e449992e20b558342af825 (patch)
tree2bc71cf97e6d7ca65c9ce0451f018a9eb23fa29d /vcl
parente31f7f4c87d5501599daa8d11d08b6e4a8725356 (diff)
Revert "Enable the new text layout engine by default"
This reverts commit d79f43d0bebbe7b1f8d68d50734737aea9fe839d. Breaks MacOSX tinderbox, need to figure out why a totally unrelated test is broken.
Diffstat (limited to 'vcl')
-rw-r--r--vcl/README.vars2
-rw-r--r--vcl/source/gdi/sallayout.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/README.vars b/vcl/README.vars
index d50a03b11a7e..10e6356951d1 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_NO_COMMON_LAYOUT - disable CommonSalLayout layout engine for text layout
+SAL_USE_COMMON_LAYOUT - use 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 2e09aaf45436..b865ff917a6e 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_NO_COMMON_LAYOUT") == nullptr;
+ static bool bUse = getenv("SAL_USE_COMMON_LAYOUT") != nullptr;
return bUse;
}