diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-18 08:08:16 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-22 09:43:10 +0200 |
commit | 6499ea2ff45fa42094d41c5c417f66a3ae5a22ae (patch) | |
tree | 3536b7bdc40b5e3f0f3b475ec34fc56f14601d90 /xmlsecurity/source/helper/xsecparser.cxx | |
parent | Revert "lokdialog: Give non-programmatic name to autofilter" (diff) | |
download | core-6499ea2ff45fa42094d41c5c417f66a3ae5a22ae.tar.gz core-6499ea2ff45fa42094d41c5c417f66a3ae5a22ae.zip |
tdf#83877 Add valid/invalid images to signatures
Change-Id: I958c1bad2f32383ebaaeb7d42c761f0d1dfefc35
Reviewed-on: https://gerrit.libreoffice.org/54513
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'xmlsecurity/source/helper/xsecparser.cxx')
-rw-r--r-- | xmlsecurity/source/helper/xsecparser.cxx | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index 4218ab571f53..e20716f0a487 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -45,6 +45,8 @@ XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper, , m_bInDate(false) , m_bInDescription(false) , m_bInSignatureLineId(false) + , m_bInSignatureLineValidImage(false) + , m_bInSignatureLineInvalidImage(false) , m_pXSecController(pXSecController) , m_bReferenceUnresolved(false) , m_nReferenceDigestID(cssxc::DigestID::SHA1) @@ -265,6 +267,16 @@ void SAL_CALL XSecParser::startElement( m_ouSignatureLineId.clear(); m_bInSignatureLineId = true; } + else if (aName == "loext:SignatureLineValidImage") + { + m_ouSignatureLineValidImage.clear(); + m_bInSignatureLineValidImage = true; + } + else if (aName == "loext:SignatureLineInvalidImage") + { + m_ouSignatureLineInvalidImage.clear(); + m_bInSignatureLineInvalidImage = true; + } if (m_xNextHandler.is()) { @@ -379,6 +391,16 @@ void SAL_CALL XSecParser::endElement( const OUString& aName ) m_pXSecController->setSignatureLineId( m_ouSignatureLineId ); m_bInSignatureLineId = false; } + else if (aName == "loext:SignatureLineValidImage") + { + m_pXSecController->setValidSignatureImage( m_ouSignatureLineValidImage ); + m_bInSignatureLineValidImage = false; + } + else if (aName == "loext:SignatureLineInvalidImage") + { + m_pXSecController->setInvalidSignatureImage( m_ouSignatureLineInvalidImage ); + m_bInSignatureLineInvalidImage = false; + } if (m_xNextHandler.is()) { @@ -458,6 +480,14 @@ void SAL_CALL XSecParser::characters( const OUString& aChars ) { m_ouSignatureLineId += aChars; } + else if (m_bInSignatureLineValidImage) + { + m_ouSignatureLineValidImage += aChars; + } + else if (m_bInSignatureLineInvalidImage) + { + m_ouSignatureLineInvalidImage += aChars; + } if (m_xNextHandler.is()) { |