[Libreoffice-commits] core.git: comphelper/source svx/uiconfig

[Luboš Luňák (via logerrit)]

 comphelper/source/misc/backupfilehelper.cxx |    5 +++++
 svx/uiconfig/ui/safemodedialog.ui           |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 626ccb3c223b5c9e26875f63a8aa1ab11674cd72
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed May 6 13:43:04 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed May 6 14:24:38 2020 +0200

    allow disabling Skia's Vulkan use in safe mode (tdf#132439)
    
    Change-Id: I2991ace387356f049fba1a730041bbb4c62c876c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93562
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index e443c384d85b..5381f48a62aa 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -1914,6 +1914,11 @@ namespace comphelper
                                                        "ForceOpenGL", "false"));
         xRootElement->appendChild(lcl_getConfigElement(xDocument, "/org.openoffice.Office.Common/Misc",
                                                        "UseOpenCL", "false"));
+        // Do not disable Skia entirely, just force it's CPU-based raster mode.
+        xRootElement->appendChild(lcl_getConfigElement(xDocument, "/org.openoffice.Office.Common/VCL",
+                                                       "ForceSkia", "false"));
+        xRootElement->appendChild(lcl_getConfigElement(xDocument, "/org.openoffice.Office.Common/VCL",
+                                                       "ForceSkiaRaster", "true"));
 
         // write back
         uno::Reference< xml::sax::XSAXSerializable > xSerializer(xDocument, uno::UNO_QUERY);
diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index c48526f3fc59..2a2a74afaf8d 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -213,7 +213,7 @@ You can make one or more of the following changes to your user profile to return
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_disable_hw_acceleration">
-                    <property name="label" translatable="yes" context="safemodedialog|check_disable_hw_acceleration">Disable hardware acceleration (OpenGL, OpenCL)</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_disable_hw_acceleration">Disable hardware acceleration (OpenGL, OpenCL, Vulkan)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>