[Libreoffice-commits] online.git: loolwsd.xml.in wsd/LOOLWSD.cpp

[Aron Budea (via logerrit)]

 loolwsd.xml.in  |    2 +-
 wsd/LOOLWSD.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dff1d32624f9794d6a169d817cc583ea41fe0c4f
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Thu Feb 20 02:24:20 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Feb 20 04:59:07 2020 +0100

    Default redlining_as_comments config to false
    
    For better performance, many comment boxes reduce performance in
    browser.
    
    Change-Id: If041c3d147ee7512d90f41a4a1bfe7a1ff8646a9
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89065
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 69ab6e934..6705f37ce 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -16,7 +16,7 @@
     <per_document desc="Document-specific settings, including LO Core settings.">
         <max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
         <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default="@VEREIGN_URL@">@VEREIGN_URL@</document_signing_url>
-        <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="true">true</redlining_as_comments>
+        <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
         <idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
         <!-- Idle save and auto save are checked every 30 seconds -->
         <!-- They are disabled when the value is zero or negative. -->
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 6012202e3..3527f8770 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -839,7 +839,7 @@ void LOOLWSD::initialize(Application& self)
             { "per_document.limit_stack_mem_kb", "8000" },
             { "per_document.limit_virt_mem_mb", "0" },
             { "per_document.max_concurrency", "4" },
-            { "per_document.redlining_as_comments", "true" },
+            { "per_document.redlining_as_comments", "false" },
             { "per_view.idle_timeout_secs", "900" },
             { "per_view.out_of_focus_timeout_secs", "120" },
             { "security.capabilities", "true" },
@@ -1086,7 +1086,7 @@ void LOOLWSD::initialize(Application& self)
     LOG_INF("MAX_CONCURRENCY set to " << maxConcurrency << ".");
 #endif
 
-    const auto redlining = getConfigValue<bool>(conf, "per_document.redlining_as_comments", true);
+    const auto redlining = getConfigValue<bool>(conf, "per_document.redlining_as_comments", false);
     if (!redlining)
     {
         setenv("DISABLE_REDLINE", "1", 1);