From 35a2b55a13be84b7ff47133083cfa0a988e1455f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:27:10 +0200 Subject: loplugin:includeform: xmlsecurity Change-Id: I9c3eca51fec52a255fcf280fe4e5ecc2ebbee5f3 --- xmlsecurity/inc/biginteger.hxx | 2 +- xmlsecurity/inc/digitalsignaturesdialog.hxx | 6 +++--- xmlsecurity/inc/documentsignaturemanager.hxx | 6 +++--- xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 2 +- xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 2 +- xmlsecurity/inc/framework/signatureengine.hxx | 6 +++--- .../inc/framework/signatureverifierimpl.hxx | 4 ++-- xmlsecurity/inc/pdfsignaturehelper.hxx | 2 +- xmlsecurity/inc/xmlsec-wrapper.h | 24 +++++++++++----------- xmlsecurity/inc/xmlsec/saxhelper.hxx | 2 +- .../inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 4 ++-- xmlsecurity/inc/xmlsignaturehelper.hxx | 4 ++-- .../source/component/documentdigitalsignatures.cxx | 2 +- xmlsecurity/source/dialogs/certificatechooser.cxx | 2 +- xmlsecurity/source/dialogs/certificateviewer.cxx | 8 ++++---- .../source/dialogs/digitalsignaturesdialog.cxx | 4 ++-- xmlsecurity/source/dialogs/macrosecurity.cxx | 4 ++-- xmlsecurity/source/dialogs/resourcemanager.cxx | 2 +- .../source/framework/saxeventkeeperimpl.cxx | 2 +- xmlsecurity/source/framework/securityengine.cxx | 2 +- .../source/framework/signaturecreatorimpl.cxx | 2 +- xmlsecurity/source/framework/signatureengine.cxx | 4 ++-- .../source/framework/signatureverifierimpl.cxx | 2 +- .../source/framework/xmlsignaturetemplateimpl.cxx | 2 +- xmlsecurity/source/gpg/SEInitializer.cxx | 2 +- xmlsecurity/source/gpg/SecurityEnvironment.cxx | 2 +- xmlsecurity/source/gpg/XMLSecurityContext.cxx | 4 ++-- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 12 +++++------ .../source/helper/documentsignaturehelper.cxx | 2 +- .../source/helper/documentsignaturemanager.cxx | 2 +- xmlsecurity/source/helper/ooxmlsecexporter.cxx | 4 ++-- xmlsecurity/source/helper/ooxmlsecparser.cxx | 2 +- xmlsecurity/source/helper/ooxmlsecparser.hxx | 2 +- xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2 +- xmlsecurity/source/helper/xsecctl.cxx | 12 +++++------ xmlsecurity/source/helper/xsecparser.cxx | 2 +- xmlsecurity/source/helper/xsecparser.hxx | 2 +- xmlsecurity/source/helper/xsecsign.cxx | 6 +++--- xmlsecurity/source/helper/xsecverify.cxx | 10 ++++----- xmlsecurity/source/xmlsec/biginteger.cxx | 2 +- xmlsecurity/source/xmlsec/errorcallback.cxx | 4 ++-- .../source/xmlsec/nss/sanextension_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/secerror.cxx | 10 ++++----- .../xmlsec/nss/securityenvironment_nssimpl.cxx | 8 ++++---- .../xmlsec/nss/securityenvironment_nssimpl.hxx | 10 ++++----- .../source/xmlsec/nss/x509certificate_nssimpl.cxx | 14 ++++++------- .../source/xmlsec/nss/x509certificate_nssimpl.hxx | 2 +- .../source/xmlsec/nss/xmlsignature_nssimpl.cxx | 10 ++++----- xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 2 +- xmlsecurity/source/xmlsec/saxhelper.cxx | 4 ++-- xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 2 +- .../xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 4 ++-- .../source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 2 +- xmlsecurity/source/xmlsec/xmlsec_init.cxx | 6 +++--- xmlsecurity/source/xmlsec/xmlstreamio.cxx | 4 ++-- xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6 +++--- 56 files changed, 129 insertions(+), 129 deletions(-) diff --git a/xmlsecurity/inc/biginteger.hxx b/xmlsecurity/inc/biginteger.hxx index 2cd116d50763..d07ecf45d8af 100644 --- a/xmlsecurity/inc/biginteger.hxx +++ b/xmlsecurity/inc/biginteger.hxx @@ -25,7 +25,7 @@ #include -#include +#include "xsecxmlsecdllapi.h" namespace xmlsecurity { diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 9f488bb91c9f..417b4c6ea8d4 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include "documentsignaturehelper.hxx" +#include "xmlsignaturehelper.hxx" +#include "documentsignaturemanager.hxx" #include diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index 71fd72bfeec5..f1cc8293de42 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -25,11 +25,11 @@ #include #include -#include -#include +#include "xmlsignaturehelper.hxx" +#include "pdfsignaturehelper.hxx" #include #include -#include +#include "documentsignaturehelper.hxx" #include /// Manages signatures (addition, removal), used by DigitalSignaturesDialog. diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 9cce03b2d593..89331ab0b427 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -30,7 +30,7 @@ #include #include #include -#include "xsecfwdllapi.h" +#include #include class BufferNode; diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index a7487b0962a4..5e6d85169452 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -29,7 +29,7 @@ #include #include -#include "framework/signatureengine.hxx" +#include typedef cppu::ImplInheritanceHelper < diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index b4e5c6c3ff8a..04757035dcbb 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -35,9 +35,9 @@ #include #include -#include "xsecfwdllapi.h" -#include "framework/securityengine.hxx" -#include "framework/xmlsignaturetemplateimpl.hxx" +#include +#include +#include #include diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 96b1267c272b..3dbef1b9a501 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -29,8 +29,8 @@ #include #include -#include "xsecfwdllapi.h" -#include "framework/signatureengine.hxx" +#include +#include typedef cppu::ImplInheritanceHelper < diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx index 50fb5dd71c05..7b89acb50aaa 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 "xmlsecuritydllapi.h" #include #include diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 6047d516a9ce..c6edfba935e0 100644 --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -29,19 +29,19 @@ #define XMLSEC_NO_SIZE_T #endif -#include "xmlsec/base64.h" -#include "xmlsec/bn.h" -#include "xmlsec/crypto.h" -#include "xmlsec/errors.h" -#include "xmlsec/io.h" -#include "xmlsec/keysmngr.h" -#include "xmlsec/strings.h" -#include "xmlsec/xmldsig.h" -#include "xmlsec/xmlenc.h" -#include "xmlsec/xmlsec.h" -#include "xmlsec/xmltree.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef XMLSEC_CRYPTO_NSS -#include "xmlsec/nss/pkikeys.h" +#include #endif #endif diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx index 44e61de8e0ef..0970f87fdd25 100644 --- a/xmlsecurity/inc/xmlsec/saxhelper.hxx +++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX #define INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX -#include "libxml/tree.h" +#include #include #include diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 94d237997702..e3d109f1993a 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -26,8 +26,8 @@ #include #include -#include "xmlsec/saxhelper.hxx" -#include "xsecxmlsecdllapi.h" +#include +#include #define NODEPOSITION_NORMAL 1 #define NODEPOSITION_STARTELEMENT 2 diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 60d6d164db61..97d73bfb3619 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include "xsecctl.hxx" +#include "xmlsecuritydllapi.h" #include #include diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 1aa7d4b4f702..840c4223ce96 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -18,7 +18,7 @@ */ #include "documentdigitalsignatures.hxx" -#include "resourcemanager.hxx" +#include #include #include diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 4358b454776b..941720c4d9f7 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -28,7 +28,7 @@ #include #include -#include "resourcemanager.hxx" +#include #include #include diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 89a9e8fdabc2..9e6f5760d132 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -29,10 +29,10 @@ #include #include -#include "strings.hrc" -#include "resourcemanager.hxx" -#include "svtools/controldims.hxx" -#include "bitmaps.hlst" +#include +#include +#include +#include #include diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 10f7d0779d2b..2e95d0566514 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -49,8 +49,8 @@ #include #include -#include "strings.hrc" -#include "resourcemanager.hxx" +#include +#include #include #include diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index e434dc093c13..6897badd4149 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -41,8 +41,8 @@ #include -#include "strings.hrc" -#include "resourcemanager.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index f5a3411e9e76..2e869691cdc2 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -18,7 +18,7 @@ */ -#include "resourcemanager.hxx" +#include #include #include diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index da70366c694c..c1855ecd31ca 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -18,7 +18,7 @@ */ -#include "framework/saxeventkeeperimpl.hxx" +#include #include "buffernode.hxx" #include "elementmark.hxx" #include "elementcollector.hxx" diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx index fa8ec96428c1..3088d5a80b4b 100644 --- a/xmlsecurity/source/framework/securityengine.cxx +++ b/xmlsecurity/source/framework/securityengine.cxx @@ -18,7 +18,7 @@ */ -#include "framework/securityengine.hxx" +#include #include diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index be94d840f525..00e635667a16 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -18,7 +18,7 @@ */ -#include "framework/signaturecreatorimpl.hxx" +#include #include #include #include diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index a9befe357d3b..bffcb68bad51 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -18,8 +18,8 @@ */ -#include "framework/signatureengine.hxx" -#include "framework/xmlsignaturetemplateimpl.hxx" +#include +#include #include #include #include diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index edda76b5bc0c..e861356a86f5 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -18,7 +18,7 @@ */ -#include "framework/signatureverifierimpl.hxx" +#include #include #include #include diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 4fed055ea4eb..5e20ce85f0ca 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -20,7 +20,7 @@ #include #include #include -#include "framework/xmlsignaturetemplateimpl.hxx" +#include using namespace ::com::sun::star::uno ; using ::com::sun::star::lang::XMultiServiceFactory ; diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx index 919161d86554..59e45d1bd2ea 100644 --- a/xmlsecurity/source/gpg/SEInitializer.cxx +++ b/xmlsecurity/source/gpg/SEInitializer.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "gpg/SEInitializer.hxx" +#include #include "SecurityEnvironment.hxx" #include "XMLSecurityContext.hxx" diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx index 2392bf0c8031..2bbcf8ddf79b 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx @@ -16,7 +16,7 @@ #include #include -#include "xmlsec-wrapper.h" +#include using namespace css; using namespace css::security; diff --git a/xmlsecurity/source/gpg/XMLSecurityContext.cxx b/xmlsecurity/source/gpg/XMLSecurityContext.cxx index 0919f4dbc2b6..1a07648d1622 100644 --- a/xmlsecurity/source/gpg/XMLSecurityContext.cxx +++ b/xmlsecurity/source/gpg/XMLSecurityContext.cxx @@ -12,8 +12,8 @@ #include -#include "xmlsec/xmlstreamio.hxx" -#include "xmlsec-wrapper.h" +#include +#include using namespace css::uno; using namespace css::lang; diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 01614e29a820..795ae85e35a4 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -20,7 +20,7 @@ #include #include #include -#include "gpg/xmlsignature_gpgimpl.hxx" +#include #include #include @@ -29,13 +29,13 @@ #include #include -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmlstreamio.hxx" -#include "xmlsec/errorcallback.hxx" +#include +#include +#include +#include #include "SecurityEnvironment.hxx" -#include "xmlsec-wrapper.h" +#include using namespace css::uno; using namespace css::lang; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 43bc7eb5eadb..509d3699a294 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -40,7 +40,7 @@ #include #include -#include "xsecctl.hxx" +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index f886b4654dd7..78ce27d18dae 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -18,7 +18,7 @@ */ #include -#include "gpg/SEInitializer.hxx" +#include #include #include diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index 8b50019d5c92..87f94958629c 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -22,8 +22,8 @@ #include #include -#include "documentsignaturehelper.hxx" -#include "xsecctl.hxx" +#include +#include using namespace com::sun::star; diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index ed93da0fcca4..b936254cc5c3 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -9,7 +9,7 @@ #include "ooxmlsecparser.hxx" -#include "xmlsignaturehelper.hxx" +#include using namespace com::sun::star; diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index bcaa581e4226..5da50e3a423a 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -17,7 +17,7 @@ #include -#include "xsecctl.hxx" +#include /// Parses an OOXML digital signature. class OOXMLSecParser: public cppu::WeakImplHelper diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index c6cf9fbf9e4c..bcfc19936688 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -20,7 +20,7 @@ #include #include -#include "xsecctl.hxx" +#include #include "xmlsignaturehelper2.hxx" diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 26b29fba6765..fe87473f3ff8 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -18,12 +18,12 @@ */ -#include "xsecctl.hxx" -#include "documentsignaturehelper.hxx" -#include "framework/saxeventkeeperimpl.hxx" -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" +#include +#include +#include +#include #if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID) -# include "gpg/xmlsignature_gpgimpl.hxx" +# include #endif #include @@ -42,7 +42,7 @@ #include #include #include -#include +#include "ooxmlsecexporter.hxx" namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index 81b7ebf7e630..50c13dc95bee 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -19,7 +19,7 @@ #include "xsecparser.hxx" -#include "xmlsignaturehelper.hxx" +#include #include #include diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index f2f59185d54d..8376a48b69cd 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX #define INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX -#include "xsecctl.hxx" +#include #include #include diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index f55c57910443..65cb3ddac800 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -18,7 +18,7 @@ */ -#include "xsecctl.hxx" +#include #include #include @@ -29,8 +29,8 @@ #include #include -#include "framework/signaturecreatorimpl.hxx" -#include "framework/saxeventkeeperimpl.hxx" +#include +#include using namespace com::sun::star; namespace cssu = com::sun::star::uno; diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 6b2031b82607..accb6d9103ae 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -18,13 +18,13 @@ */ -#include "xsecctl.hxx" +#include #include "xsecparser.hxx" #include "ooxmlsecparser.hxx" -#include "framework/signatureverifierimpl.hxx" -#include "framework/saxeventkeeperimpl.hxx" -#include "gpg/xmlsignature_gpgimpl.hxx" -#include "gpg/SEInitializer.hxx" +#include +#include +#include +#include #include #include diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 3981754cb776..04037ab59e87 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -20,7 +20,7 @@ #include -#include "xmlsec-wrapper.h" +#include #include using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 2931f60566bc..7feef2438e85 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "xmlsec/errorcallback.hxx" +#include -#include "xmlsec-wrapper.h" +#include #ifdef _WIN32 #include diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index 5e2e36e18155..95b4c357ceeb 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -29,7 +29,7 @@ #include #include #include -#include "certificateextension_certextn.hxx" +#include #include class SanExtensionImpl : public ::cppu::WeakImplHelper< diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx index 1423bbbcf0fd..9473942ab7c5 100644 --- a/xmlsecurity/source/xmlsec/nss/secerror.cxx +++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx @@ -18,12 +18,12 @@ */ -#include "secerr.h" +#include #include "secerror.hxx" -#include "sslerr.h" -#include "nspr.h" -#include "nss.h" -#include "certt.h" +#include +#include +#include +#include #include #include #include diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 91044a2c9d2f..380ae4d4ee40 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -18,9 +18,9 @@ */ #include "nssrenam.h" -#include "cert.h" -#include "secerr.h" -#include "ocsp.h" +#include +#include +#include #include #include @@ -29,7 +29,7 @@ #include "x509certificate_nssimpl.hxx" #include -#include "xmlsec-wrapper.h" +#include #include #include diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index fc83a3eb1286..0e47cd9d4213 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -38,12 +38,12 @@ #include -#include "pk11func.h" -#include "keyhi.h" -#include "certdb.h" -#include "list" +#include +#include +#include +#include -#include "xmlsec-wrapper.h" +#include class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment , diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index c2f0f1da6213..173a215c1613 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -18,20 +18,20 @@ */ #include "nssrenam.h" -#include "nspr.h" -#include "nss.h" -#include "secder.h" +#include +#include +#include -#include "hasht.h" -#include "secoid.h" -#include "pk11func.h" +#include +#include +#include #include #include #include #include "x509certificate_nssimpl.hxx" -#include "certificateextension_xmlsecimpl.hxx" +#include #include "sanextension_nssimpl.hxx" #include diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index 58759673935b..8f22a8f37363 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -31,7 +31,7 @@ #include #include -#include "cert.h" +#include class X509Certificate_NssImpl : public ::cppu::WeakImplHelper< css::security::XCertificate , diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index a78ff38695ef..3389fd149086 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -21,16 +21,16 @@ #include #include "xmlsignature_nssimpl.hxx" -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmlstreamio.hxx" -#include "xmlsec/errorcallback.hxx" +#include +#include +#include +#include #include "securityenvironment_nssimpl.hxx" #include "xmlsecuritycontext_nssimpl.hxx" -#include "xmlsec-wrapper.h" +#include using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index 555cd60b4a90..9e424a4e5d79 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -27,7 +27,7 @@ #include "seinitializer_nssimpl.hxx" #include "xmlsignature_nssimpl.hxx" #include "xmlsecuritycontext_nssimpl.hxx" -#include "xsec_xmlsec.hxx" +#include #include "securityenvironment_nssimpl.hxx" using namespace ::cppu; diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 10b2a0784acf..52d62b120bec 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -20,8 +20,8 @@ #include -#include "xmlsec/saxhelper.hxx" -#include "libxml/parserInternals.h" +#include +#include #ifndef XMLSEC_NO_XSLT #include "libxslt/xslt.h" diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index 372b68330f83..ea1c2d6f263d 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -31,7 +31,7 @@ #include #include #include -#include "biginteger.hxx" +#include #include "serialnumberadapter.hxx" diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 5ff6935a9075..75da47627c18 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -22,8 +22,8 @@ #include #include #include -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" +#include +#include #include diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 0cdea05f4523..b9e20e782120 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -19,7 +19,7 @@ #include -#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" +#include #include #include #include diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx index 9b2fe90f87c2..181fcac98a1b 100644 --- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx +++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "xmlsec/xmlsec_init.hxx" +#include #include -#include "xmlsec/xmlstreamio.hxx" -#include "xmlsec-wrapper.h" +#include +#include using namespace css::uno; diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 556cb3ce8fa6..de32f8286c1b 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -21,12 +21,12 @@ /* * Implementation of the I/O interfaces based on stream and URI binding */ -#include "xmlsec/xmlstreamio.hxx" +#include #include #include #include -#include "xmlsec-wrapper.h" +#include #define XMLSTREAMIO_INITIALIZED 0x01 #define XMLSTREAMIO_REGISTERED 0x02 diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 2a700cc59d62..807eff2cddee 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -23,12 +23,12 @@ #include #include "serialnumberadapter.hxx" -#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" +#include +#include #include "xsec_xmlsec.hxx" #if !defined(MACOSX) && !defined(WNT) && !defined(ANDROID) -# include "gpg/xmlsignature_gpgimpl.hxx" +# include #endif using namespace ::cppu; -- cgit