diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-11 14:57:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-11 17:30:02 +0100 |
| commit | d7d86dfe4a83dd49192efe167e50c19e75109cde (patch) | |
| tree | c426124c59d4fe9b1a55d3c9c4f34b6b567334f8 /xmlsecurity | |
| parent | 01c62797c2c8acf6cb8cdd0f713411dca5411ac3 (diff) | |
xmlsecurity: import OOXML <X509IssuerName>
This is redundant, but it's needed to survive an export -> import ->
export flow, and at the end required in the OOXML result.
Change-Id: I0779950b6464b4e15f4da452c163cddbc3d03a3d
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecparser.cxx | 13 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecparser.hxx | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index 4c930d18ea21..da2ed2c0f9b6 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -19,6 +19,7 @@ OOXMLSecParser::OOXMLSecParser(XSecController* pXSecController) ,m_bInX509Certificate(false) ,m_bInMdssiValue(false) ,m_bInSignatureComments(false) + ,m_bInX509IssuerName(false) ,m_bReferenceUnresolved(false) { } @@ -100,6 +101,11 @@ throw (xml::sax::SAXException, uno::RuntimeException, std::exception) m_aSignatureComments.clear(); m_bInSignatureComments = true; } + else if (rName == "X509IssuerName") + { + m_aX509IssuerName.clear(); + m_bInX509IssuerName = true; + } if (m_xNextHandler.is()) m_xNextHandler->startElement(rName, xAttribs); @@ -141,6 +147,11 @@ void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax: m_pXSecController->setDescription(m_aSignatureComments); m_bInSignatureComments = false; } + else if (rName == "X509IssuerName") + { + m_pXSecController->setX509IssuerName(m_aX509IssuerName); + m_bInX509IssuerName = false; + } if (m_xNextHandler.is()) m_xNextHandler->endElement(rName); @@ -158,6 +169,8 @@ void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax m_aMdssiValue += rChars; else if (m_bInSignatureComments) m_aSignatureComments += rChars; + else if (m_bInX509IssuerName) + m_aX509IssuerName += rChars; if (m_xNextHandler.is()) m_xNextHandler->characters(rChars); diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index dbb01517fdc9..1914d4ca50fd 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -39,6 +39,9 @@ class OOXMLSecParser: public cppu::WeakImplHelper OUString m_aMdssiValue; bool m_bInSignatureComments; OUString m_aSignatureComments; + bool m_bInX509IssuerName; + OUString m_aX509IssuerName; + /// Last seen <Reference URI="...">. OUString m_aReferenceURI; /// Already called addStreamReference() for this reference. |