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

[Tomaž Vajngerl (via logerrit)]

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

New commits:
commit 09941b9a249cb3d10cd8b22ccb0d10550351a7ad
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 10 14:55:49 2021 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue May 11 08:46:57 2021 +0200

    lok: enable macros by default for Android
    
    This enables macros execution for Android, so the user will be
    asked to execute macros (assuming the security level is set to 1,
    which is the default) if the document contains any macros to
    execute.
    
    Change-Id: I34dbd123c5b4ea7386096fd3a21766da3479be6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115301
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3e6231157cfa..9d4c8d5336cd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2323,9 +2323,13 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
         }
         SvtSecurityOptions().SetMacroSecurityLevel(nMacroSecurityLevel);
 
+#if defined(ANDROID) && HAVE_FEATURE_ANDROID_LOK
+        sal_Int16 nMacroExecMode = document::MacroExecMode::USE_CONFIG;
+#else
         const OUString aEnableMacrosExecution = extractParameter(aOptions, "EnableMacrosExecution");
         sal_Int16 nMacroExecMode = aEnableMacrosExecution == "true" ? document::MacroExecMode::USE_CONFIG :
             document::MacroExecMode::NEVER_EXECUTE;
+#endif
         aFilterOptions[2].Name = "MacroExecutionMode";
         aFilterOptions[2].Value <<= nMacroExecMode;