diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2021-01-18 15:24:48 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-30 14:18:32 +0100 |
| commit | fe69915020518bcee87e29e3623ad50a73b9b5da (patch) | |
| tree | 39325c5a5a3cc25455a791550b9a033aa9a483f2 /include | |
| parent | 3170c655e93e9068ae9e8823240fd3003ac13d61 (diff) | |
Improve macro checks
Change-Id: Ie40801df8866b52c1458e020ffa9cba120720af7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109552
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 1dc71daf7fa7204a98c75dac680af664ab9c8edb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110056
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/docmacromode.hxx | 7 | ||||
| -rw-r--r-- | include/svtools/sfxecode.hxx | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 9533518bee9d..aa120240688e 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -220,7 +220,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 @@ -286,11 +287,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; }; diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx index a57c6b9e966f..fe6f26dc3623 100644 --- a/include/svtools/sfxecode.hxx +++ b/include/svtools/sfxecode.hxx @@ -36,6 +36,7 @@ class ErrCode; #define ERRCODE_SFX_CANTCREATEBACKUP ErrCode(ErrCodeArea::Sfx, ErrCodeClass::Create, 50) #define ERRCODE_SFX_MACROS_SUPPORT_DISABLED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 51) #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 52) +#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 53) #define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 54) #define ERRCODE_SFX_INCOMPLETE_ENCRYPTION ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 55) #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC \ |