[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loolwsd.xml.in wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 loolwsd.xml.in  |    1 +
 wsd/LOOLWSD.cpp |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 2ff64d81ed3188994b755c0533526cc776f5c8c4
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Nov 8 21:02:57 2018 +0000
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Nov 8 22:21:44 2018 +0100

    Nasty hack to disable red-lining via config setting and the environment.
    
    Change-Id: I67303fa9593c53a4575b4b45e2b2c879ae8ee890
    Reviewed-on: https://gerrit.libreoffice.org/63137
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index b951846e4..1bb19a63c 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -17,6 +17,7 @@
     <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
     <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>
+	<redlining_as_comments desc="If true show red-lines as comments" type="bool" default="true">true</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 -->
         <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="uint" default="30">30</idlesave_duration_secs>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b46ac2232..19fd798ae 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -717,6 +717,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_view.idle_timeout_secs", "900" },
             { "per_view.out_of_focus_timeout_secs", "60" },
             { "security.capabilities", "true" },
@@ -942,6 +943,13 @@ void LOOLWSD::initialize(Application& self)
         setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
     }
 
+    const auto redlining = getConfigValue<bool>(conf, "per_document.redlining_as_comments", true);
+    if (!redlining)
+    {
+        setenv("DISABLE_REDLINE", "1", 1);
+        LOG_INF("DISABLE_REDLINE set");
+    }
+
     // Otherwise we profile the soft-device at jail creation time.
     setenv("SAL_DISABLE_OPENCL", "true", 1);