From c210019f36ec4a640fe1967b562454a21c371d63 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 5 Sep 2017 22:57:54 +0200 Subject: xmlsecurity: no need to have pdfio/pdfdocument.hxx as a global header Which means xmlsecurity can be again a module that has no public headers. Change-Id: I3d0b03680398f80196fac187263e770fd44ed0ed Reviewed-on: https://gerrit.libreoffice.org/41966 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- xmlsecurity/inc/documentsignaturehelper.hxx | 2 +- xmlsecurity/inc/documentsignaturemanager.hxx | 2 +- xmlsecurity/inc/pdfio/pdfdocument.hxx | 39 ++++++++++++++++++++++++ xmlsecurity/inc/pdfsignaturehelper.hxx | 2 +- xmlsecurity/inc/xmlsecuritydllapi.h | 23 ++++++++++++++ xmlsecurity/inc/xmlsignaturehelper.hxx | 2 +- xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 2 +- xmlsecurity/source/helper/pdfsignaturehelper.cxx | 2 +- xmlsecurity/source/pdfio/pdfdocument.cxx | 2 +- xmlsecurity/workben/pdfverify.cxx | 2 +- 10 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 xmlsecurity/inc/pdfio/pdfdocument.hxx create mode 100644 xmlsecurity/inc/xmlsecuritydllapi.h (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx index 3997ae47260d..1c5d1b97a972 100644 --- a/xmlsecurity/inc/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/documentsignaturehelper.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "xmlsecurity/xmlsecuritydllapi.h" +#include "xmlsecuritydllapi.h" #include diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index 146943812eb0..71fd72bfeec5 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX -#include "xmlsecurity/xmlsecuritydllapi.h" +#include "xmlsecuritydllapi.h" #include diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx b/xmlsecurity/inc/pdfio/pdfdocument.hxx new file mode 100644 index 000000000000..622bc1ffb678 --- /dev/null +++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#ifndef INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX +#define INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX + +#include + +#include + +#include + +struct SignatureInformation; + +namespace xmlsecurity +{ +namespace pdfio +{ + +/** + * @param rInformation The actual result. + * @param bLast If this is the last signature in the file, so it covers the whole file physically. + * @return If we can determinate a result. + */ +XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignature, SignatureInformation& rInformation, bool bLast); + +} // namespace pdfio +} // namespace xmlsecurity + +#endif // INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx index 7da417c46e4f..50fb5dd71c05 100644 --- a/xmlsecurity/inc/pdfsignaturehelper.hxx +++ b/xmlsecurity/inc/pdfsignaturehelper.hxx @@ -11,7 +11,7 @@ #ifndef INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX #define INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX -#include +#include #include #include diff --git a/xmlsecurity/inc/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h new file mode 100644 index 000000000000..f0540c799b48 --- /dev/null +++ b/xmlsecurity/inc/xmlsecuritydllapi.h @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H + +#include + +#if defined(XMLSECURITY_DLLIMPLEMENTATION) +#define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 93385202e171..60d6d164db61 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx index 37faa04aada7..39746ac2a233 100644 --- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx @@ -17,7 +17,7 @@ #include #include -#include +#include using namespace com::sun::star; diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx index 9bb6e59d0380..19efd7ae8195 100644 --- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx +++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include using namespace ::com::sun::star; diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx index d0d56f4bd409..08437b2f8cae 100644 --- a/xmlsecurity/source/pdfio/pdfdocument.cxx +++ b/xmlsecurity/source/pdfio/pdfdocument.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include #include diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx index 673eb0171050..4f872a3dad1b 100644 --- a/xmlsecurity/workben/pdfverify.cxx +++ b/xmlsecurity/workben/pdfverify.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include -- cgit