summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-04-01 08:42:24 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-04-06 16:21:41 +0200
commit573d9193a04c7dd13aa9e3271becf92e5a50de75 (patch)
tree07c5722c4a78dc2d170b801e9929e1a1afa8a827 /include
parent9e05066dc95aa6926bb874a54a039688abc22bee (diff)
Revert "Revert "Improve macro checks""
This reverts commit ab495359f6e4eadbf6a14dd44eb05b775fb5f989. Change-Id: If240d4237a2066c49e1ddcafef1b85ccd3b9f2b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113626 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/docmacromode.hxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 7e1511625086..19199f7a410e 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -218,7 +218,8 @@ namespace sfx2
<TRUE/> if and only if macro execution in this document is allowed.
*/
bool adjustMacroMode(
- const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction,
+ bool bHasValidContentSignature = false
);
/** determines whether macro execution is disallowed
@@ -284,11 +285,13 @@ namespace sfx2
*/
bool
checkMacrosOnLoading(
- const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction,
+ bool bHasValidContentSignature = false
);
private:
std::shared_ptr< DocumentMacroMode_Data > m_xData;
+ bool m_bNeedsContentSigned;
};