[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

[Michael Meeks (via logerrit)]

 sw/source/core/doc/DocumentSettingManager.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 87ac748c2f27abb0230e3f866b8638bd64da8243
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Apr 16 15:56:41 2021 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Apr 16 18:06:40 2021 +0200

    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 at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

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: