summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/docmacromode.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-13 13:21:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-04-15 11:35:03 +0000
commitd208cf834f4f191558ae27ea7a8c7a31b8e440a6 (patch)
tree4b318cdb42b9888197247089cb0a7349f122dd99 /sfx2/source/doc/docmacromode.cxx
parent9782438a5887c40246016c1f2b5fe12401d2c68d (diff)
convert SIGNATURESTATE_ constants to scoped enum
Change-Id: I715e39599464a199a8b78ec274bfe47b90fc4bb7 Reviewed-on: https://gerrit.libreoffice.org/15301 Tested-by: Noel Grandin <noelgrandin@gmail.com> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/doc/docmacromode.cxx')
-rw-r--r--sfx2/source/doc/docmacromode.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 54fd58ef51f0..9381651d7f1a 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -246,8 +246,8 @@ namespace sfx2
// the trusted macro check will also retrieve the signature state ( small optimization )
bool bHasTrustedMacroSignature = m_xData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
- sal_uInt16 nSignatureState = m_xData->m_rDocumentAccess.getScriptingSignatureState();
- if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN )
+ SignatureState nSignatureState = m_xData->m_rDocumentAccess.getScriptingSignatureState();
+ if ( nSignatureState == SignatureState::BROKEN )
{
// the signature is broken, no macro execution
if ( nMacroExecutionMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN )
@@ -260,8 +260,8 @@ namespace sfx2
// there is trusted macro signature, allow macro execution
return allowMacroExecution();
}
- else if ( nSignatureState == SIGNATURESTATE_SIGNATURES_OK
- || nSignatureState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED )
+ else if ( nSignatureState == SignatureState::OK
+ || nSignatureState == SignatureState::NOTVALIDATED )
{
// there is valid signature, but it is not from the trusted author
return disallowMacroExecution();