diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-23 03:55:21 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-25 19:07:52 +0000 |
| commit | e838d143178ee82c786d11fd792d8d6735858933 (patch) | |
| tree | 139243b6608df462b76e0477a1ae55f7a6d09252 | |
| parent | 1700c767e7bfcc7193d878ac53c21e1b59354973 (diff) | |
Revert "tdf#89870: Add config option for layout engine"
This reverts commit 6324efd70dfa8c6be84cba1fa29658e3373cbbe3.
The old layout engines will soon be gone.
Change-Id: Iedbcffd18b11ac36ad98a66ac12111058aab19b3
Reviewed-on: https://gerrit.libreoffice.org/31142
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Khaled Hosny <khaledhosny@eglug.org>
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c5129ed4536c..abd9c3942442 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -851,13 +851,6 @@ <info> <desc>Contains settings for VCL.</desc> </info> - <prop oor:name="TextLayoutEngine" oor:type="xs:string" oor:nillable="false"> - <info> - <desc>Specifies which text layout engine should be use. Possible - values are ("old", "new").</desc> - </info> - <value>new</value> - </prop> <prop oor:name="UseOpenGL" oor:type="xs:boolean" oor:nillable="false"> <info> <desc>Specifies if OpenGL rendering should be used in VCL backends diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 0034bca78b7a..4c15c8fef3a5 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -34,8 +34,6 @@ #include <i18nlangtag/lang.h> -#include <officecfg/Office/Common.hxx> - #include <tools/debug.hxx> #include <vcl/svapp.hxx> @@ -772,8 +770,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) bool SalLayout::UseCommonLayout() { - static bool bUse = (getenv("SAL_NO_COMMON_LAYOUT") == nullptr) && - (officecfg::Office::Common::VCL::TextLayoutEngine::get() == "new"); + static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr; return bUse; } |