summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/doc/docmacromode.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index ef9546365451..e2c1150c33ef 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -207,9 +207,9 @@ namespace sfx2
{
return disallowMacroExecution();
}
- else if ( m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading() &&
- bHasTrustedMacroSignature &&
- !bHasValidContentSignature)
+ else if (nMacroExecutionMode != MacroExecMode::ALWAYS_EXECUTE
+ && m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading()
+ && bHasTrustedMacroSignature && !bHasValidContentSignature)
{
// When macros are signed, and the document has events which call macros, the document content needs to be signed too.
m_xData->m_bHasUnsignedContentError = true;