officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 -------
vcl/source/gdi/sallayout.cxx | 5 +----
2 files changed, 1 insertion(+), 11 deletions(-)
New commits:
commit e838d143178ee82c786d11fd792d8d6735858933
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Wed Nov 23 03:55:21 2016 +0200
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 <khaledho...@eglug.org>
Tested-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c5129ed..abd9c39 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 0034bca..4c15c8f 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
