summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-02-27 14:29:03 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-14 13:39:39 +0100
commit2ffc2672afff20a8c32cbfe7518923c739346a59 (patch)
tree44370375bec883cf7bba0299be96493b7f1f89d9 /xmlsecurity
parentfe8b2a1e72d99ea3f2604dafaf247ac1dd7c68b4 (diff)
tdf#105093 vcl PDF export: add embedded video testcase
Fails with commit 4ad249af88d15f2c8a09f0721a59d82718fcc201 (tdf#105093 sd PDF export: handle embedded videos, 2017-01-04) reverted. Change-Id: I413ec9a5da3c0783541dcd28fb9a62dd896f955b Reviewed-on: https://gerrit.libreoffice.org/34681 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 64bac5c0f005afd46bbf402c5d548e2ee6c9e5c4)
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/pdfio/pdfdocument.cxx36
1 files changed, 5 insertions, 31 deletions
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 6ffe711363c1..5dd2f0aeaa65 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -100,24 +100,6 @@ public:
sal_uInt64 GetLocation() const;
};
-/// Reference object: something with a unique ID.
-class PDFReferenceElement : public PDFElement
-{
- PDFDocument& m_rDoc;
- int m_fObjectValue;
- int m_fGenerationValue;
-
-public:
- PDFReferenceElement(PDFDocument& rDoc, int fObjectValue, int fGenerationValue);
- bool Read(SvStream& rStream) override;
- /// Assuming the reference points to a number object, return its value.
- double LookupNumber(SvStream& rStream) const;
- /// Lookup referenced object, without assuming anything about its contents.
- PDFObjectElement* LookupObject();
- int GetObjectValue() const;
- int GetGenerationValue() const;
-};
-
/// End of a stream: 'endstream' keyword.
class PDFEndStreamElement : public PDFElement
{
@@ -132,19 +114,6 @@ public:
bool Read(SvStream& rStream) override;
};
-/// Array object: a list.
-class PDFArrayElement : public PDFElement
-{
- /// Location after the '[' token.
- sal_uInt64 m_nOffset = 0;
- std::vector<PDFElement*> m_aElements;
-public:
- PDFArrayElement();
- bool Read(SvStream& rStream) override;
- void PushBack(PDFElement* pElement);
- const std::vector<PDFElement*>& GetElements();
-};
-
/// End of an array: ']'.
class PDFEndArrayElement : public PDFElement
{
@@ -3159,6 +3128,11 @@ PDFObjectElement* PDFDictionaryElement::LookupObject(const OString& rDictionaryK
return pKey->LookupObject();
}
+PDFElement* PDFDictionaryElement::LookupElement(const OString& rDictionaryKey)
+{
+ return PDFDictionaryElement::Lookup(m_aItems, rDictionaryKey);
+}
+
PDFElement* PDFObjectElement::Lookup(const OString& rDictionaryKey)
{
if (m_aDictionary.empty())