diff options
Diffstat (limited to 'xmlsecurity/source')
29 files changed, 47 insertions, 47 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index f510f9c9ec30..476da3da7d1c 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -18,12 +18,12 @@ */ #include "documentdigitalsignatures.hxx" -#include <xmlsecurity/digitalsignaturesdialog.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/macrosecurity.hxx> -#include <xmlsecurity/biginteger.hxx> -#include <xmlsecurity/global.hrc> +#include <digitalsignaturesdialog.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <macrosecurity.hxx> +#include <biginteger.hxx> +#include <global.hrc> #include <sax/tools/converter.hxx> diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 3bc155b4657f..7ab640570e2d 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> namespace com { namespace sun { namespace star { diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src index 7202fe958f23..38f090ce6f6c 100644 --- a/xmlsecurity/source/component/warnbox.src +++ b/xmlsecurity/source/component/warnbox.src @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/global.hrc> +#include <global.hrc> String RID_XMLSECWB_NO_MOZILLA_PROFILE { diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 70fe823254ca..ce92dfd4a0e5 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -18,9 +18,9 @@ */ -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 9c4e39767f87..3749160a5078 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/security/CertificateCharacters.hpp> diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index 65cceb6085d2..ce7e97c14118 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -21,7 +21,7 @@ #define INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC #include <svtools/controldims.hrc> -#include <xmlsecurity/global.hrc> +#include <global.hrc> #define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;} diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f79296fb5d32..91bf1c33de0a 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/digitalsignaturesdialog.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <digitalsignaturesdialog.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <sax/tools/converter.hxx> #include <com/sun/star/embed/XStorage.hpp> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc index 51dee1c5aa8b..25aa5cc6a6ea 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC #define INCLUDED_DIGITALSIGNATURESDIALOG_HRC -//global.hrc in xmlsecurity/inc starts at 1000 +//global.hrc in inc starts at 1000 #define RID_DIGITALSIGNATUREDLG_START 2000 #define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 0eaefdf75c22..9d7950e36d1a 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -18,10 +18,10 @@ */ -#include <xmlsecurity/macrosecurity.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <macrosecurity.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <osl/file.hxx> #include <vcl/help.hxx> diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 30dbede00a1f..d50a4fc497f6 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -18,7 +18,7 @@ */ -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include <algorithm> diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.hxx b/xmlsecurity/source/helper/ooxmlsecexporter.hxx index 3b3d04eadb27..1a96430bba9a 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.hxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.hxx @@ -15,7 +15,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> /// Writes a single OOXML digital signature. class OOXMLSecExporter diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index e7e8e05cdb06..b1d155449b13 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -18,8 +18,8 @@ */ -#include <xmlsecurity/xmlsignaturehelper.hxx> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include "xsecctl.hxx" #include "xmlsignaturehelper2.hxx" diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index a850a83fbc60..772b7cd56a5b 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include "xmlsignaturehelper2.hxx" #include <tools/solar.h> diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 4f124a2dc07e..4d02bce95dd5 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECCTL_HXX #define INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECCTL_HXX -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XParser.hpp> diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 3c33ea8a36b0..5b7075c47e47 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -18,9 +18,9 @@ */ -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <com/sun/star/uno/Sequence.hxx> using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 14e4863bc2a9..d1b25b6e6dbc 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -23,7 +23,7 @@ */ #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::xml::crypto; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 84fd8e80848c..30295452e2d2 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -38,10 +38,10 @@ #include "x509certificate_mscryptimpl.hxx" #include <comphelper/servicehelper.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/akmngr.h" -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> #include <comphelper/windowserrorstring.hxx> #include <sal/log.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index ddb812bc5292..62df6b7fa85b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -45,7 +45,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <list> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <sal/types.h> diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 985dc2cdc149..f0c262b96db1 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -22,7 +22,7 @@ #include "securityenvironment_mscryptimpl.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/app.h" #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index c9cbc7295c86..0ff4c0ba891f 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -28,7 +28,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #ifdef UNX #define stricmp strcasecmp diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 21dd902b0cfc..8615671ed291 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -23,7 +23,7 @@ #include "xmlsecuritycontext_mscryptimpl.hxx" #include "xmlstreamio.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/akmngr.h" using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index e350282a3afd..a23af537a925 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -27,7 +27,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 47f609bb144d..a0db87690f78 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -29,12 +29,12 @@ #include "x509certificate_nssimpl.hxx" #include <comphelper/servicehelper.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/docpasswordrequest.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> #include <sal/log.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <vector> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 58b91ffc2749..38ebdf031e44 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -43,7 +43,7 @@ #include "certdb.h" #include "list" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment , diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index bc4ae4720612..8aa9e014d3bd 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -28,7 +28,7 @@ #include "securityenvironment_nssimpl.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 8cf0f94e429f..8e51babf6a08 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -24,7 +24,7 @@ #include "xmlsecuritycontext_nssimpl.hxx" #include "xmlstreamio.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 21c78d578b22..1cdd52066a4f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -31,7 +31,7 @@ #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index 5b484224405a..1772671c8ff2 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -31,7 +31,7 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> -#include "xmlsecurity/biginteger.hxx" +#include "biginteger.hxx" #include "serialnumberadapter.hxx" diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 2370bd6bd7e1..2d2bb236460b 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -26,7 +26,7 @@ #include <rtl/uri.hxx> #include <libxml/uri.h> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #define XMLSTREAMIO_INITIALIZED 0x01 #define XMLSTREAMIO_REGISTERED 0x02 |