summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2021-04-16 15:56:41 +0100
committerMichael Meeks <michael.meeks@collabora.com>2021-04-16 18:06:02 +0200
commitffc5d0fe1ab2453d267c6474c50f3b978df60a8b (patch)
tree261782dc807b23af343eb21d9a3599fc28c64fc4
parentX11SalGraphics::SupportsCairo is pretty slow and its value won't change (diff)
downloadcore-ffc5d0fe1ab2453d267c6474c50f3b978df60a8b.tar.gz
core-ffc5d0fe1ab2453d267c6474c50f3b978df60a8b.zip
lok: force writer web-view off.
A number of callers mutate this, so make the setting un-writable. Change-Id: I0a3727020309b92543e42730c997168f076e7bfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114177 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 928160b07b91..6ea5ea058da7 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -24,6 +24,7 @@
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <osl/diagnose.h>
@@ -408,7 +409,11 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
// COMPATIBILITY FLAGS END
case DocumentSettingId::BROWSE_MODE: //can be used temporary (load/save) when no SwViewShell is available
- mbLastBrowseMode = value;
+ // Can't render in webview successfully.
+ if (comphelper::LibreOfficeKit::isActive())
+ mbLastBrowseMode = false;
+ else
+ mbLastBrowseMode = value;
break;
case DocumentSettingId::HTML_MODE: