diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-08 10:17:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-08 16:23:12 +0100 |
| commit | bfba46d90fc4146ab2a48d155d90dafc8c0a067e (patch) | |
| tree | 53d9015f8088e9bcf90dfb8aa19fdeb1e4846100 /sfx2 | |
| parent | f0df7c7c7fd4109937f21c2278f9a57e59c73761 (diff) | |
Simplify a bit
Change-Id: I05ef5346f5aab25b208aa058658353cf71e68e87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159103
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docmacromode.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index ec23ebe62578..377c14517586 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -227,23 +227,17 @@ namespace sfx2 return disallowMacroExecution(); } } - - // at this point it is clear that the document is neither in secure location nor signed with trusted certificate - if ( ( nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN ) - || ( nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_WARN ) - ) - { - return disallowMacroExecution(); - } } catch ( const Exception& ) { - if ( ( nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_WARN ) - || ( nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN ) - ) - { - return disallowMacroExecution(); - } + DBG_UNHANDLED_EXCEPTION("sfx.doc"); + } + + // at this point it is clear that the document is neither in secure location nor signed with trusted certificate + if ((nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN) + || (nMacroExecutionMode == MacroExecMode::FROM_LIST_AND_SIGNED_WARN)) + { + return disallowMacroExecution(); } #if defined(_WIN32) |