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/dialogs | |
parent | acf531be6a423f9b74997b29a8cafe82aa18423c (diff) |
Use enum class for two local enums
Change-Id: I0d7e6a14ec890b8a1dbdea3685b543b63426c628
Diffstat (limited to 'xmlsecurity/source/dialogs')
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 61789f68686f..8e77931aabb4 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -165,9 +165,15 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( switch( maSignatureManager.meSignatureMode ) { - case SignatureModeDocumentContent: m_pHintDocFT->Show(); break; - case SignatureModeMacros: m_pHintBasicFT->Show(); break; - case SignatureModePackage: m_pHintPackageFT->Show(); break; + case DocumentSignatureMode::Content: + m_pHintDocFT->Show(); + break; + case DocumentSignatureMode::Macros: + m_pHintBasicFT->Show(); + break; + case DocumentSignatureMode::Package: + m_pHintPackageFT->Show(); + break; } } @@ -270,7 +276,7 @@ bool DigitalSignaturesDialog::canAddRemove() //As of OOo 3.2 the document signature includes in macrosignatures.xml. That is //adding a macro signature will break an existing document signature. //The sfx2 will remove the documentsignature when the user adds a macro signature - if (maSignatureManager.meSignatureMode == SignatureModeMacros + if (maSignatureManager.meSignatureMode == DocumentSignatureMode::Macros && ret) { if (m_bHasDocumentSignature && !m_bWarningShowSignMacro) @@ -518,20 +524,20 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() //by an version of OOo previous to 3.2 // If there is no storage, then it's pointless to check storage // stream references. - else if (maSignatureManager.meSignatureMode == SignatureModeDocumentContent + else if (maSignatureManager.meSignatureMode == DocumentSignatureMode::Content && bSigValid && bCertValid && (maSignatureManager.mxStore.is() && !DocumentSignatureHelper::isOOo3_2_Signature( maSignatureManager.maCurrentSignatureInformations[n]))) { aImage = m_pSigsNotvalidatedImg->GetImage(); bAllNewSignatures &= false; } - else if (maSignatureManager.meSignatureMode == SignatureModeDocumentContent + else if (maSignatureManager.meSignatureMode == DocumentSignatureMode::Content && bSigValid && bCertValid && DocumentSignatureHelper::isOOo3_2_Signature( maSignatureManager.maCurrentSignatureInformations[n])) { aImage = m_pSigsValidImg->GetImage(); } - else if (maSignatureManager.meSignatureMode == SignatureModeMacros + else if (maSignatureManager.meSignatureMode == DocumentSignatureMode::Macros && bSigValid && bCertValid) { aImage = m_pSigsValidImg->GetImage(); |