[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sfx2/source

[Mike Kaganski (via logerrit)]

 sfx2/source/doc/docmacromode.cxx |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 5348c57a6598a021e1efa7158b2ad332194c3ec0
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Nov 8 10:17:42 2023 +0300
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 13 09:29:38 2023 +0100

    Simplify a bit
    
    Change-Id: I05ef5346f5aab25b208aa058658353cf71e68e87
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159103
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159272
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index b2c0477bf5b2..893b68e42e20 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)