From d208cf834f4f191558ae27ea7a8c7a31b8e440a6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Apr 2015 13:21:04 +0200 Subject: convert SIGNATURESTATE_ constants to scoped enum Change-Id: I715e39599464a199a8b78ec274bfe47b90fc4bb7 Reviewed-on: https://gerrit.libreoffice.org/15301 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- sfx2/source/doc/docmacromode.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sfx2/source/doc/docmacromode.cxx') 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(); -- cgit