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

[Mike Kaganski (via logerrit)]

 sfx2/source/doc/docmacromode.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9954382d3edaccf00acf930c3c40bf81f6c743a8
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Nov 8 09:19:17 2023 +0300
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 13 09:27:56 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 <mike.kagan...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159268
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 0f3c48ba7b21..16f8a76e7fbe 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