loolwsd.xml.in | 1 + wsd/LOOLWSD.cpp | 8 ++++++++ 2 files changed, 9 insertions(+)
New commits: commit ff31b2cd8115ff998a52b63fcc5bda22daba3e3d Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Thu Nov 8 21:02:57 2018 +0000 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Nov 28 16:44:27 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 <ke...@collabora.com> Tested-by: Jan Holesovsky <ke...@collabora.com> (cherry picked from commit 2ff64d81ed3188994b755c0533526cc776f5c8c4) diff --git a/loolwsd.xml.in b/loolwsd.xml.in index 48c053adb..7ba63f0a0 100644 --- a/loolwsd.xml.in +++ b/loolwsd.xml.in @@ -18,6 +18,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 desc="If true show the document signing menu item." type="bool" default="false">false</document_signing> + <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 438004b7f..c91791d15 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -789,6 +789,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" }, @@ -1022,6 +1023,13 @@ 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); + 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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits