From f87d2d7c3ba0f566fc129865543924ef5401916c Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Mon, 23 Mar 2020 12:11:24 +0100 Subject: Related tdf#97694 Check Base macro signatures on load Change-Id: I45c6eae633c41585c6c7e4c5fff0b187a6dc1f60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90908 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit f2f93434f4795646255e5d8edd31fa08b8b2ffab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91916 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens --- include/sfx2/objsh.hxx | 2 -- include/sfx2/signaturestate.hxx | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 83033e57ed70..5a39ef39dd42 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -686,8 +686,6 @@ public: SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing ); SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl(); SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl(); - SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation( - const css::uno::Sequence< css::security::DocumentSignatureInformation >& aInfos ); SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); SAL_DLLPRIVATE void SetModifyPasswordEntered( bool bEntered = true ); SAL_DLLPRIVATE bool IsModifyPasswordEntered(); diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx index 8bdfdfac75d9..e480e56b059e 100644 --- a/include/sfx2/signaturestate.hxx +++ b/include/sfx2/signaturestate.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_SFX2_SIGNATURESTATE_HXX #define INCLUDED_SFX2_SIGNATURESTATE_HXX +#include + +#include + enum class SignatureState { // FIXME: Do these values have to be these, and given at all, or is this just cargo cult? @@ -38,6 +42,13 @@ enum class SignatureState NOTVALIDATED_PARTIAL_OK = 6 }; +namespace DocumentSignatures +{ +/** Get document signature state */ +SFX2_DLLPUBLIC SignatureState +getSignatureState(const css::uno::Sequence& aInfos); +} + #endif // INCLUDED_SFX2_SIGNATURESTATE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit