diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-21 18:03:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 16:13:58 +0200 |
| commit | 205245f4768e801f27f3ae440d327b0ec48f0dd0 (patch) | |
| tree | 42ea883e08b69a36efd7b4736ed1820f64d89281 /xmlsecurity/workben | |
| parent | f52417d6478f3bf593e2ad160da2d0dd6e2693ec (diff) | |
vcl: move in PDF tokenizer from xmlsecurity
The PDF code in xmlsecurity served two purposes:
- a generic PDF tokenizer
- signature verification
The first purpose is useful to have in VCL, so the PDF export code can
use it as well when it comes to PDF image handling.
This commit just moves most of the PDF code to VCL, it does not touch
the PDF export code yet. With this, also the somewhat odd xmlsecurity
dependency of CppunitTest_vcl_pdfexport can be removed as well.
Change-Id: I6fe8294ed5c4aa4d79f4b2ddef80a4d1c9d566cc
Reviewed-on: https://gerrit.libreoffice.org/35513
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 7415b71b7976319b0c04e670facabd20b30e3fe2)
Diffstat (limited to 'xmlsecurity/workben')
| -rw-r--r-- | xmlsecurity/workben/pdfverify.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx index 2b43c1ef3137..7746a6e7b716 100644 --- a/xmlsecurity/workben/pdfverify.cxx +++ b/xmlsecurity/workben/pdfverify.cxx @@ -177,7 +177,7 @@ int pdfVerify(int nArgc, char** pArgv) bRemoveSignature = true; SvFileStream aStream(aInURL, StreamMode::READ); - xmlsecurity::pdfio::PDFDocument aDocument; + vcl::filter::PDFDocument aDocument; if (!aDocument.Read(aStream)) { SAL_WARN("xmlsecurity.pdfio", "failed to read the document"); @@ -187,7 +187,7 @@ int pdfVerify(int nArgc, char** pArgv) if (bRemoveSignature) { std::cerr << "removing the last signature" << std::endl; - std::vector<xmlsecurity::pdfio::PDFObjectElement*> aSignatures = aDocument.GetSignatureWidgets(); + std::vector<vcl::filter::PDFObjectElement*> aSignatures = aDocument.GetSignatureWidgets(); if (aSignatures.empty()) { std::cerr << "found no signatures" << std::endl; @@ -214,7 +214,7 @@ int pdfVerify(int nArgc, char** pArgv) if (aOutURL.isEmpty()) { std::cerr << "verifying signatures" << std::endl; - std::vector<xmlsecurity::pdfio::PDFObjectElement*> aSignatures = aDocument.GetSignatureWidgets(); + std::vector<vcl::filter::PDFObjectElement*> aSignatures = aDocument.GetSignatureWidgets(); if (aSignatures.empty()) std::cerr << "found no signatures" << std::endl; else |