mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#89870: Add config option for layout engine

Browse Source 
The env variable takes precedence.

Change-Id: I273ec867725dd012b005d49fbfaa1dc27203c021
This commit is contained in:
Khaled Hosny
2016-11-03 19:21:01 +02:00
parent 43532a0944
commit 6324efd70d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -851,6 +851,13 @@
<info> <info>
<desc>Contains settings for VCL.</desc> <desc>Contains settings for VCL.</desc>
</info> </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"> <prop oor:name="UseOpenGL" oor:type="xs:boolean" oor:nillable="false">
<info> <info>
<desc>Specifies if OpenGL rendering should be used in VCL backends <desc>Specifies if OpenGL rendering should be used in VCL backends

5
vcl/source/gdi/sallayout.cxx
View File

@@ -34,6 +34,8 @@
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <officecfg/Office/Common.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
@@ -770,7 +772,8 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
bool SalLayout::UseCommonLayout() bool SalLayout::UseCommonLayout()
{ {
static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr; static bool bUse = (getenv("SAL_NO_COMMON_LAYOUT") == nullptr) &&
(officecfg::Office::Common::VCL::TextLayoutEngine::get() == "new");
return bUse; return bUse;
} }