diff options
Diffstat (limited to 'xmlsecurity')
45 files changed, 92 insertions, 92 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/biginteger.hxx index 7b3cafa06648..73f6259c966b 100644 --- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx +++ b/xmlsecurity/inc/biginteger.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX +#define INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX #include <sal/config.h> #include <rtl/ustring.hxx> diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index e24c457bfc81..ec555b6724ee 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX +#define INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX #include <svtools/simptabl.hxx> #include <vcl/dialog.hxx> @@ -36,7 +36,7 @@ namespace xml { namespace crypto { }}} #include <com/sun/star/uno/Sequence.hxx> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> class HeaderBar; @@ -79,6 +79,6 @@ public: OUString UsageInClearText(int bits); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX +#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index fa9e33f14f2b..c0072c5077ac 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX +#define INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -145,6 +145,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX +#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 83370dbb8c6d..4c3a13fe722e 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX +#ifndef INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX +#define INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> @@ -27,8 +27,8 @@ #include <svtools/stdctrl.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include <documentsignaturemanager.hxx> #include <vector> @@ -124,6 +124,6 @@ public: bool SignaturesChanged() const { return mbSignaturesChanged; } }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX +#endif // INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx index 9ccbd3aff792..4767e585629a 100644 --- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/documentsignaturehelper.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX +#define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> -#include "xmlsecurity/sigstruct.hxx" +#include "sigstruct.hxx" #include "xmlsecuritydllapi.h" #include <vector> @@ -97,6 +97,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX +#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index 361de61e3bec..a3881052fb88 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -21,11 +21,11 @@ #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX #include "xmlsecuritydllapi.h" -#include <xmlsecurity/sigstruct.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <sigstruct.hxx> +#include <xmlsignaturehelper.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> /// Manages signatures (addition, removal), used by DigitalSignaturesDialog. @@ -61,6 +61,6 @@ public: void write(); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREMANAGER_HXX +#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/global.hrc index 0b4b0ac7a58a..00dfdd33cc58 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/global.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC +#ifndef INCLUDED_XMLSECURITY_INC_GLOBAL_HRC +#define INCLUDED_XMLSECURITY_INC_GLOBAL_HRC // global resource ids diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 4c6d5f37c4a5..fb308d5a6b97 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX +#ifndef INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX +#define INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -147,6 +147,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX +#endif // INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 3c566596ea91..dde0b196af29 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts */ #include <algorithm> @@ -304,6 +304,6 @@ #include <unotools/readwritemutexguard.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx index 8ea24be36a43..fbfaea7b1566 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xsec_fw --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts */ #include <cassert> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 089c2192c4ff..aee27c5fee2f 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts */ #include <cassert> @@ -114,7 +114,7 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <xmloff/dllapi.h> -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> // Cleanup windows header macro pollution. #if defined(_WIN32) && defined(WINAPI) diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/sigstruct.hxx index 5a7df3dedd76..8650a8f84ac2 100644 --- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx +++ b/xmlsecurity/inc/sigstruct.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX +#ifndef INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX +#define INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX #include <rtl/ustring.hxx> #include <com/sun/star/util/DateTime.hpp> diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 9d20cedd6b4a..3d5c24b9b6f1 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H +#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H +#define INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H #include <sal/config.h> diff --git a/xmlsecurity/inc/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h index f0540c799b48..2349d239b862 100644 --- a/xmlsecurity/inc/xmlsecuritydllapi.h +++ b/xmlsecurity/inc/xmlsecuritydllapi.h @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H -#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#ifndef INCLUDED_XMLSECURITY_INCDLLAPI_H +#define INCLUDED_XMLSECURITY_INCDLLAPI_H #include <sal/types.h> @@ -18,6 +18,6 @@ #define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#endif // INCLUDED_XMLSECURITY_INCDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 869d66bbab6d..4118b6304b42 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX +#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX #include <vector> #include <tools/link.hxx> #include <rtl/ustring.hxx> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> #include <xmlsecuritydllapi.h> #include <com/sun/star/uno/XComponentContext.hpp> @@ -193,6 +193,6 @@ public: void ExportSignatureContentTypes(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX +#endif // INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index d2a9f1741f34..767b0fa33a77 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -38,8 +38,8 @@ #include <osl/file.hxx> #include <comphelper/ofopxmlhelper.hxx> -#include <xmlsecurity/documentsignaturehelper.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include <documentsignaturemanager.hxx> using namespace com::sun::star; 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 |