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

[Henry Castro (via logerrit)]

 desktop/source/lib/init.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d7aa69d3b3418f388518a726a44b6433b0586de9
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Mar 5 16:28:57 2021 -0400
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Mar 9 11:12:08 2021 +0100

    lok: add "EnableMacrosExecution" option
    
    Change-Id: I2ad31e2e7f66fdfca1eee07622a4a9fec8b62861
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112030
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index af9c9ed1c41b..81b15d4b4fa4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2274,7 +2274,9 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
         aFilterOptions[1].Name = "InteractionHandler";
         aFilterOptions[1].Value <<= xInteraction;
 
-        sal_Int16 nMacroExecMode = document::MacroExecMode::NEVER_EXECUTE;
+        const OUString aEnableMacrosExecution = extractParameter(aOptions, "EnableMacrosExecution");
+        sal_Int16 nMacroExecMode = aEnableMacrosExecution == "true" ? document::MacroExecMode::USE_CONFIG :
+            document::MacroExecMode::NEVER_EXECUTE;
         aFilterOptions[2].Name = "MacroExecutionMode";
         aFilterOptions[2].Value <<= nMacroExecMode;