offapi/com/sun/star/document/MacroExecMode.idl | 3 ++- sfx2/source/doc/docmacromode.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 89210b46b718edb6fffcbff610a789a5fea522e7 Author: Mike Kaganski <[email protected]> AuthorDate: Wed Nov 8 09:19:17 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Nov 8 11:39:26 2023 +0100 Set document's current macro exec mode consistently in adjustMacroMode Change-Id: Id69d4d043d824b1a9e558bfc9395c4ff64da7c38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159099 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index b1488b5dbe48..e3fe09c35feb 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -160,10 +160,10 @@ namespace sfx2 } if ( nMacroExecutionMode == MacroExecMode::NEVER_EXECUTE ) - return false; + return disallowMacroExecution(); if ( nMacroExecutionMode == MacroExecMode::ALWAYS_EXECUTE_NO_WARN ) - return true; + return allowMacroExecution(); const OUString sURL(m_xData->m_rDocumentAccess.getDocumentLocation()); try commit ce625d02aa384694bad9bbec4df14eebee0666c8 Author: Mike Kaganski <[email protected]> AuthorDate: Wed Nov 8 09:15:17 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Nov 8 11:39:14 2023 +0100 Clarify FROM_LIST_AND_SIGNED_WARN description a bit Change-Id: Icab6b5b2e0c290bf67f1b330ad82553e9e37328e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159098 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/offapi/com/sun/star/document/MacroExecMode.idl b/offapi/com/sun/star/document/MacroExecMode.idl index 25aac568b633..6eb99af1418b 100644 --- a/offapi/com/sun/star/document/MacroExecMode.idl +++ b/offapi/com/sun/star/document/MacroExecMode.idl @@ -90,7 +90,8 @@ published constants MacroExecMode <p> If the macro is signed with unknown certificate a warning will appear. The macro either will not be executed or if the warning - allows confirmation, it will be executed after user agrees. + allows confirmation, it will be executed after user agrees to + trust the certificate. </p> */ const short FROM_LIST_AND_SIGNED_WARN = 8;
