diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 09:10:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 08:40:05 +0000 |
| commit | 6d40c515fdf86d807c199ff4179b9c862a9fe5b2 (patch) | |
| tree | 53edc46fc7fa083a77a8f714be08aca8aae73eae /xmlsecurity/source/helper | |
| parent | 010a2a8ed3214380d514be56171c974f99010bc1 (diff) | |
libxmlsec: drop xmlsec1-keyinfo-revert.patch.1 completely
And instead attempt to set up the test environment correctly.
Change-Id: I06c10b96749c0464da8d2dd9a59b48f16baeead5
Reviewed-on: https://gerrit.libreoffice.org/27785
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/source/helper')
| -rw-r--r-- | xmlsecurity/source/helper/documentsignaturemanager.cxx | 5 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecexporter.cxx | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 3c8f7d596b03..a947ed55f745 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -56,11 +56,6 @@ bool DocumentSignatureManager::isXML(const OUString& rURI) { SAL_WARN_IF(!mxStore.is(), "xmlsecurity.helper", "empty storage reference"); - // FIXME figure out why this is necessary. - static bool bTest = getenv("LO_TESTNAME"); - if (bTest) - return true; - bool bIsXML = false; bool bPropsAvailable = false; const OUString sPropFullPath("FullPath"); diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index 590d33ead7aa..9b71c3ccaa4f 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -421,10 +421,7 @@ void OOXMLSecExporter::Impl::writePackageSignature() m_xDocumentHandler->startElement(NSTAG_XD ":" TAG_QUALIFYINGPROPERTIES, uno::Reference<xml::sax::XAttributeList>(pAttributeList.get())); } - // FIXME why does this part crash NSS when MOZILLA_CERTIFICATE_FOLDER is not set? - static bool bTest = getenv("LO_TESTNAME"); - if (!bTest) - writeSignedProperties(); + writeSignedProperties(); m_xDocumentHandler->endElement(NSTAG_XD ":" TAG_QUALIFYINGPROPERTIES); m_xDocumentHandler->endElement(TAG_OBJECT); |