From e29e44ff895cd58f2947f4bb2cefdeee9dd0f5d3 Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Sat, 17 Feb 2007 09:56:08 +0000 Subject: [PATCH] Store away the digital signature origin. This prevents a warning on loading files containing signatures, and is also a start towards proper handling of digital signatures. svn path=/trunk/playground/graphics/okular/; revision=634423 --- generators/xps/generator_xps.cpp | 2 ++ generators/xps/generator_xps.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp index 0e38ce419..7e5dfcaeb 100644 --- a/generators/xps/generator_xps.cpp +++ b/generators/xps/generator_xps.cpp @@ -925,6 +925,8 @@ bool XpsFile::loadDocument(const QString &filename) fixedRepresentationFileName = e.attribute("Target"); } else if ("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" == e.attribute("Type") ) { m_corePropertiesFileName = e.attribute("Target"); + } else if ("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin" == e.attribute("Type") ) { + m_signatureOrigin = e.attribute("Target"); } else { kDebug() << "Unknown relationships element: " << e.attribute("Type") << " : " << e.attribute("Target") << endl; } diff --git a/generators/xps/generator_xps.h b/generators/xps/generator_xps.h index 23f2881af..cd39e7ee1 100644 --- a/generators/xps/generator_xps.h +++ b/generators/xps/generator_xps.h @@ -191,7 +191,6 @@ private: QImage *m_pageImage; bool m_pageIsRendered; - friend class XpsHandler; friend class XpsTextExtractionHandler; }; @@ -292,6 +291,8 @@ private: QString m_corePropertiesFileName; Okular::DocumentInfo * m_docInfo; + QString m_signatureOrigin; + KZip * m_xpsArchive; QMap m_fontCache;