diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-05-10 14:55:49 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-05-11 08:46:57 +0200 |
| commit | 09941b9a249cb3d10cd8b22ccb0d10550351a7ad (patch) | |
| tree | 6421662742992b590df7b6ba36c6278b68be8320 /desktop | |
| parent | 5037e5456fa573720bc29163bd0fb529d18355c6 (diff) | |
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@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; |