dbaccess/source/core/dataaccess/ModelImpl.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6f37a5ce0c06e4872088b5ac3fe5ca0ef09123ad
Author: Samuel Mehrbrodt <samuel.mehrbr...@collabora.com>
AuthorDate: Mon Jul 28 08:17:26 2025 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@collabora.com>
CommitDate: Thu Jul 31 08:07:56 2025 +0200
Related tdf#97694 Don't require signed document in Base
Macros were disabled in Base when calls to macros were detected in
the Base document - since the document is not signed.
However, Base does not support document signatures at this stage.
So relax that requirement to require a signed document when detecting
calls to signed macros from an unsigned document - at least for Base.
Change-Id: I129f3ffb2607a1c5eebf4795fcd1638c206aea22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188458
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 9970f97ddf83..08d8c6a918d9 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1124,7 +1124,8 @@ bool ODatabaseModelImpl::checkMacrosOnLoading()
Reference< XInteractionHandler > xInteraction;
xInteraction = m_aMediaDescriptor.getOrDefault(
u"InteractionHandler"_ustr, xInteraction );
const bool bHasMacros = m_aMacroMode.hasMacros();
- return m_aMacroMode.checkMacrosOnLoading(xInteraction, false
/*HasValidContentSignature*/, bHasMacros);
+ // Since Base does not support document signatures, we always assume that
the content signature is valid.
+ return m_aMacroMode.checkMacrosOnLoading(xInteraction, true
/*HasValidContentSignature*/, bHasMacros);
}
void ODatabaseModelImpl::resetMacroExecutionMode()
