xmlsecurity/inc/documentsignaturehelper.hxx | 15 +++++---
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 2 -
xmlsecurity/qa/unit/signing/signing.cxx | 10 ++---
xmlsecurity/source/component/documentdigitalsignatures.cxx | 20 +++++-----
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 20 +++++++---
xmlsecurity/source/helper/documentsignaturehelper.cxx | 24 ++++++-------
xmlsecurity/source/helper/documentsignaturemanager.cxx | 2 -
7 files changed, 52 insertions(+), 41 deletions(-)
New commits:
commit 0bbc15aa24d08c4051c8afc67da345517a07707a
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Nov 1 14:49:56 2016 +0200
Use enum class for two local enums
Change-Id: I0d7e6a14ec890b8a1dbdea3685b543b63426c628
diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx
b/xmlsecurity/inc/documentsignaturehelper.hxx
index 4767e58..d2eb803 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -47,13 +47,18 @@ namespace embed {
**********************************************************/
-enum DocumentSignatureMode { SignatureModeDocumentContent,
SignatureModeMacros, SignatureModePackage };
+enum class DocumentSignatureMode
+{
+ Content,
+ Macros,
+ Package
+};
-enum DocumentSignatureAlgorithm
+enum class DocumentSignatureAlgorithm
{
- OOo2Document,
- OOo3_0Document,
- OOo3_2Document
+ OOo2,
+ OOo3_0,
+ OOo3_2
};
struct SignatureStreamHelper
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 5ee1322..469ded6 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -221,7 +221,7 @@ void PDFSigningTest::testPDFRemoveAll()
OUString aOutURL = aTargetDir + "remove-all.pdf";
CPPUNIT_ASSERT_EQUAL(osl::File::RC::E_None,
osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) + "2good.pdf",
aOutURL));
// Load the test document as a storage and read its two signatures.
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
SvStream* pStream = utl::UcbStreamHelper::CreateStream(aOutURL,
StreamMode::READ | StreamMode::WRITE);
uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream));
aManager.mxSignatureStream = xStream;
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx
b/xmlsecurity/qa/unit/signing/signing.cxx
index 465a25f..6415586 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -190,7 +190,7 @@ void SigningTest::testDescription()
aMediaDescriptor["FilterName"] <<= OUString("writer8");
xStorable->storeAsURL(aTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
CPPUNIT_ASSERT(aManager.maSignatureHelper.Init());
uno::Reference <embed::XStorage> xStorage =
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
aTempFile.GetURL(), embed::ElementModes::READWRITE);
CPPUNIT_ASSERT(xStorage.is());
@@ -223,7 +223,7 @@ void SigningTest::testOOXMLDescription()
aMediaDescriptor["FilterName"] <<= OUString("MS Word 2007 XML");
xStorable->storeAsURL(aTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
CPPUNIT_ASSERT(aManager.maSignatureHelper.Init());
uno::Reference <embed::XStorage> xStorage =
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
aTempFile.GetURL(), embed::ElementModes::READWRITE);
CPPUNIT_ASSERT(xStorage.is());
@@ -253,7 +253,7 @@ void SigningTest::testOOXMLAppend()
CPPUNIT_ASSERT_EQUAL(osl::File::RC::E_None,
osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) + "partial.docx",
aURL));
// Load the test document as a storage and read its single signature.
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
CPPUNIT_ASSERT(aManager.maSignatureHelper.Init());
uno::Reference <embed::XStorage> xStorage =
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
aURL, embed::ElementModes::READWRITE);
CPPUNIT_ASSERT(xStorage.is());
@@ -278,7 +278,7 @@ void SigningTest::testOOXMLAppend()
void SigningTest::testOOXMLRemove()
{
// Load the test document as a storage and read its signatures: purpose1
and purpose2.
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
CPPUNIT_ASSERT(aManager.maSignatureHelper.Init());
OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "multi.docx";
uno::Reference <embed::XStorage> xStorage =
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
aURL, embed::ElementModes::READWRITE);
@@ -309,7 +309,7 @@ void SigningTest::testOOXMLRemoveAll()
CPPUNIT_ASSERT_EQUAL(osl::File::RC::E_None,
osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) + "partial.docx",
aURL));
// Load the test document as a storage and read its single signature.
- DocumentSignatureManager aManager(mxComponentContext,
SignatureModeDocumentContent);
+ DocumentSignatureManager aManager(mxComponentContext,
DocumentSignatureMode::Content);
CPPUNIT_ASSERT(aManager.maSignatureHelper.Init());
uno::Reference <embed::XStorage> xStorage =
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
aURL, embed::ElementModes::READWRITE);
CPPUNIT_ASSERT(xStorage.is());
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 5d52098..08da227 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;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 61789f6..8e77931 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();
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 365f690..3909c4c 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -97,7 +97,7 @@ void ImplFillElementList(
// OOXML
continue;
- if (mode != OOo3_2Document
+ if (mode != DocumentSignatureAlgorithm::OOo3_2
&& (pNames[n] == "META-INF" || pNames[n] == "mimetype"))
{
continue;
@@ -162,13 +162,13 @@ DocumentSignatureHelper::getDocumentAlgorithm(
const OUString & sODFVersion, const SignatureInformation & sigInfo)
{
OSL_ASSERT(!sODFVersion.isEmpty());
- DocumentSignatureAlgorithm mode = OOo3_2Document;
+ DocumentSignatureAlgorithm mode = DocumentSignatureAlgorithm::OOo3_2;
if (!isOOo3_2_Signature(sigInfo))
{
if (isODFPre_1_2(sODFVersion))
- mode = OOo2Document;
+ mode = DocumentSignatureAlgorithm::OOo2;
else
- mode = OOo3_0Document;
+ mode = DocumentSignatureAlgorithm::OOo3_0;
}
return mode;
}
@@ -199,9 +199,9 @@ DocumentSignatureHelper::CreateElementList(
switch ( eMode )
{
- case SignatureModeDocumentContent:
+ case DocumentSignatureMode::Content:
{
- if (mode == OOo2Document) //that is, ODF 1.0, 1.1
+ if (mode == DocumentSignatureAlgorithm::OOo2) //that is, ODF 1.0,
1.1
{
// 1) Main content
ImplFillElementList(aElements, rxStore, OUString(), false,
mode);
@@ -252,7 +252,7 @@ DocumentSignatureHelper::CreateElementList(
}
}
break;
- case SignatureModeMacros:
+ case DocumentSignatureMode::Macros:
{
// 1) Macros
OUString aSubStorageName( "Basic" );
@@ -290,7 +290,7 @@ DocumentSignatureHelper::CreateElementList(
}
}
break;
- case SignatureModePackage:
+ case DocumentSignatureMode::Package:
{
// Everything except META-INF
ImplFillElementList(aElements, rxStore, OUString(), true, mode);
@@ -370,9 +370,9 @@ SignatureStreamHelper
DocumentSignatureHelper::OpenSignatureStream(
if ( aHelper.xSignatureStorage.is() )
{
OUString aSIGStreamName;
- if ( eDocSigMode == SignatureModeDocumentContent )
+ if ( eDocSigMode == DocumentSignatureMode::Content )
aSIGStreamName =
DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName();
- else if ( eDocSigMode == SignatureModeMacros )
+ else if ( eDocSigMode == DocumentSignatureMode::Macros )
aSIGStreamName =
DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName();
else
aSIGStreamName =
DocumentSignatureHelper::GetPackageSignatureDefaultStreamName();
@@ -425,7 +425,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
if ( ( rInf.nType == SignatureReferenceType::BINARYSTREAM ) || (
rInf.nType == SignatureReferenceType::XMLSTREAM ) )
{
OUString sReferenceURI = rInf.ouURI;
- if (alg == OOo2Document)
+ if (alg == DocumentSignatureAlgorithm::OOo2)
{
//Comparing URIs is a difficult. Therefore we kind of normalize
//it before comparing. We assume that our URI do not have a
leading "./"
@@ -440,7 +440,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
for (CIT aIter = sElementList.begin(); aIter !=
sElementList.end(); ++aIter)
{
OUString sElementListURI = *aIter;
- if (alg == OOo2Document)
+ if (alg == DocumentSignatureAlgorithm::OOo2)
{
sElementListURI =
::rtl::Uri::encode(
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index dee86c8..3e33e10 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -243,7 +243,7 @@ bool DocumentSignatureManager::add(const
uno::Reference<security::XCertificate>&
maSignatureHelper.SetX509Certificate(nSecurityId, xCert->getIssuerName(),
aCertSerial, aStrBuffer.makeStringAndClear(), aCertDigest);
- std::vector< OUString > aElements =
DocumentSignatureHelper::CreateElementList(mxStore, meSignatureMode,
OOo3_2Document);
+ std::vector< OUString > aElements =
DocumentSignatureHelper::CreateElementList(mxStore, meSignatureMode,
DocumentSignatureAlgorithm::OOo3_2);
DocumentSignatureHelper::AppendContentTypes(mxStore, aElements);
sal_Int32 nElements = aElements.size();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
