[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - include/svl xmlsecurity/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 29 08:51:50 UTC 2021
include/svl/sigstruct.hxx | 4 ++--
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 83bb9734339803e7408c919e0be52059d0c95449
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed May 30 12:10:52 2018 +0200
Commit: Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Mon Mar 29 10:51:19 2021 +0200
Fix comments
Signature lines is no longer ooxml specific
Change-Id: I092dbc31b30d30bf68b4cb733cb7cb8520c99738
Reviewed-on: https://gerrit.libreoffice.org/55058
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
(cherry picked from commit 8fe7198466011a411b46295cb646338b8745308c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113178
Tested-by: Michael Stahl <michael.stahl at allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index 662d8ef889f7..891f620ec547 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -125,10 +125,10 @@ struct SignatureInformation
OUString ouDescriptionPropertyId;
/// OOXML certificate SHA-256 digest, empty for ODF except when doing XAdES signature.
OUString ouCertDigest;
- /// OOXML Valid and invalid signature images
+ /// Valid and invalid signature line images
css::uno::Reference<css::graphic::XGraphic> aValidSignatureImage;
css::uno::Reference<css::graphic::XGraphic> aInvalidSignatureImage;
- /// OOXML Signature Line Id, used to map signatures to their respective signature line images.
+ /// Signature Line Id, used to map signatures to their respective signature line images.
OUString ouSignatureLineId;
/// A full OOXML signature for unchanged roundtrip, empty for ODF.
css::uno::Sequence<sal_Int8> aSignatureBytes;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index bf9187b956b8..9ad3cfc4814b 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -552,7 +552,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
rSigInfo.SignatureIsValid = ( rInfo.nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
- // OOXML Signature line info (ID + Images)
+ // Signature line info (ID + Images)
if (!rInfo.ouSignatureLineId.isEmpty())
rSigInfo.SignatureLineId = rInfo.ouSignatureLineId;
More information about the Libreoffice-commits
mailing list