summaryrefslogtreecommitdiff
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:40 +0200
commit87ac748c2f27abb0230e3f866b8638bd64da8243 (patch)
tree9522b5a8c5c516243b31ff8492d615cd3f121900
parentcb32c96b7cb39f497b0cda46ad6dd4fbf0f9b1be (diff)
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/+/114178 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-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 d7af55649e62..e69d50d123e6 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -22,6 +22,7 @@
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <svx/svdmodel.hxx>
@@ -400,7 +401,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: