diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-11-01 14:49:56 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-11-01 16:38:32 +0200 |
commit | 0bbc15aa24d08c4051c8afc67da345517a07707a (patch) | |
tree | b247a08a0190857eac026079e9665f4855e59352 /xmlsecurity/source/component | |
parent | acf531be6a423f9b74997b29a8cafe82aa18423c (diff) |
Use enum class for two local enums
Change-Id: I0d7e6a14ec890b8a1dbdea3685b543b63426c628
Diffstat (limited to 'xmlsecurity/source/component')
-rw-r--r-- | xmlsecurity/source/component/documentdigitalsignatures.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 5d52098227af..08da227b3ebd 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -114,7 +114,7 @@ sal_Bool DocumentDigitalSignatures::signDocumentContent( throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplViewSignatures( rxStorage, xSignStream, SignatureModeDocumentContent, false ); + return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Content, false ); } Sequence< css::security::DocumentSignatureInformation > @@ -123,7 +123,7 @@ DocumentDigitalSignatures::verifyDocumentContentSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModeDocumentContent ); + return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content ); } void DocumentDigitalSignatures::showDocumentContentSignatures( @@ -131,7 +131,7 @@ void DocumentDigitalSignatures::showDocumentContentSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - ImplViewSignatures( rxStorage, xSignInStream, SignatureModeDocumentContent, true ); + ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content, true ); } OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName() @@ -146,7 +146,7 @@ sal_Bool DocumentDigitalSignatures::signScriptingContent( { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was not initialized properly"); - return ImplViewSignatures( rxStorage, xSignStream, SignatureModeMacros, false ); + return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Macros, false ); } Sequence< css::security::DocumentSignatureInformation > @@ -155,7 +155,7 @@ DocumentDigitalSignatures::verifyScriptingContentSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModeMacros ); + return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros ); } void DocumentDigitalSignatures::showScriptingContentSignatures( @@ -163,7 +163,7 @@ void DocumentDigitalSignatures::showScriptingContentSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - ImplViewSignatures( rxStorage, xSignInStream, SignatureModeMacros, true ); + ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros, true ); } OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName() @@ -178,7 +178,7 @@ sal_Bool DocumentDigitalSignatures::signPackage( const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplViewSignatures( rxStorage, xSignStream, SignatureModePackage, false ); + return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Package, false ); } Sequence< css::security::DocumentSignatureInformation > @@ -187,7 +187,7 @@ DocumentDigitalSignatures::verifyPackageSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModePackage ); + return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package ); } void DocumentDigitalSignatures::showPackageSignatures( @@ -195,7 +195,7 @@ void DocumentDigitalSignatures::showPackageSignatures( const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - ImplViewSignatures( rxStorage, xSignInStream, SignatureModePackage, true ); + ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package, true ); } OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) @@ -378,7 +378,7 @@ DocumentDigitalSignatures::ImplVerifySignatures( DocumentSignatureHelper::checkIfAllFilesAreSigned( aElementsToBeVerified, rInfo, mode); } - if (eMode == SignatureModeDocumentContent) + if (eMode == DocumentSignatureMode::Content) { if (aStreamHelper.nStorageFormat == embed::StorageFormats::OFOPXML) rSigInfo.PartialDocumentSignature = true; |