diff options
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r-- | xmlsecurity/inc/bitmaps.hlst | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/securityengine.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureengine.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureverifierimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/gpg/SEInitializer.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/strings.hrc | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec-wrapper.h | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/errorcallback.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/saxhelper.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/xmlsec_init.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/xmlstreamio.hxx | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecuritydllapi.h | 5 | ||||
-rw-r--r-- | xmlsecurity/inc/xsecxmlsecdllapi.h | 5 |
18 files changed, 18 insertions, 72 deletions
diff --git a/xmlsecurity/inc/bitmaps.hlst b/xmlsecurity/inc/bitmaps.hlst index 52a9df754e48..add5c78f59ef 100644 --- a/xmlsecurity/inc/bitmaps.hlst +++ b/xmlsecurity/inc/bitmaps.hlst @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_INC_BITMAPS_HRC -#define INCLUDED_XMLSECURITY_INC_BITMAPS_HRC +#pragma once #define BMP_STATE_NOT_VALIDATED "xmlecurity/res/notcertificate_40x56.png" @@ -19,6 +18,4 @@ #define BMP_SIG_INVALID "svx/res/caution_11x16.png" #define BMP_SIG_NOT_VALIDATED "xmlsecurity/res/notcertificate_16.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index e3edb857934f..203ac16a33da 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SAXEVENTKEEPERIMPL_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SAXEVENTKEEPERIMPL_HXX +#pragma once #include <com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.hpp> #include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp> @@ -288,7 +287,5 @@ OUString SAXEventKeeperImpl_getImplementationName(); /// @throws css::uno::RuntimeException css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index 980d61a6570a..bebf07306b63 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SECURITYENGINE_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SECURITYENGINE_HXX +#pragma once #include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp> #include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp> @@ -140,6 +139,4 @@ public: virtual sal_Bool SAL_CALL endMission( ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index 212feb25cb48..d0fc1dc33369 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATURECREATORIMPL_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATURECREATORIMPL_HXX +#pragma once #include <com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp> #include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.hpp> @@ -93,7 +92,5 @@ OUString SignatureCreatorImpl_getImplementationName(); /// @throws css::uno::RuntimeException css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 48e4ce5f3f08..6446c2f36729 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREENGINE_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREENGINE_HXX +#pragma once #include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp> #include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp> @@ -114,6 +113,4 @@ public: SAL_CALL getUriBinding( const OUString& uri ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 37327fd5f9fb..15c79643e0aa 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREVERIFIERIMPL_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREVERIFIERIMPL_HXX +#pragma once #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -85,7 +84,5 @@ OUString SignatureVerifierImpl_getImplementationName(); /// @throws css::uno::RuntimeException css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx index 4f10e5db23fe..c0dee1173b73 100644 --- a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX -#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX +#pragma once #include <sal/config.h> #include <rtl/ustring.hxx> @@ -93,6 +92,4 @@ class XMLSignatureTemplateImpl final : public ::cppu::WeakImplHelper< static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; }; -#endif // INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/gpg/SEInitializer.hxx b/xmlsecurity/inc/gpg/SEInitializer.hxx index 67ab7a53188e..e4da22029c3d 100644 --- a/xmlsecurity/inc/gpg/SEInitializer.hxx +++ b/xmlsecurity/inc/gpg/SEInitializer.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_SOURCE_GPG_SEINITIALIZER_HXX -#define INCLUDED_XMLSECURITY_SOURCE_GPG_SEINITIALIZER_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -45,6 +44,4 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx index 39c8496f2218..906a51d19c1e 100644 --- a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx +++ b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_SOURCE_GPG_XMLSIGNATURE_GPGIMPL_HXX -#define INCLUDED_XMLSECURITY_SOURCE_GPG_XMLSIGNATURE_GPGIMPL_HXX +#pragma once #include <sal/config.h> #include <rtl/ustring.hxx> @@ -75,6 +74,4 @@ class XSECXMLSEC_DLLPUBLIC XMLSignature_GpgImpl final : public ::cppu::WeakImplH static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; -#endif // INCLUDED_XMLSECURITY_SOURCE_GPG_XMLSIGNATURE_GPGIMPL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/strings.hrc b/xmlsecurity/inc/strings.hrc index e16a3dd7b5db..648758825054 100644 --- a/xmlsecurity/inc/strings.hrc +++ b/xmlsecurity/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_STRINGS_HRC -#define INCLUDED_XMLSECURITY_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -65,6 +64,4 @@ #define STR_BROKEN_MACRO_CERTIFICATE_DATA NC_("STR_BROKEN_MACRO_CERTIFICATE_DATA", "Macro security problem!\n\nBroken certificate data: %{data}") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index c060c8bf23b8..e4048de94bf2 100644 --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H -#define INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H +#pragma once #include <sal/config.h> @@ -45,6 +44,4 @@ #include <xmlsec/nss/pkikeys.h> #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec/errorcallback.hxx b/xmlsecurity/inc/xmlsec/errorcallback.hxx index 511d20ae1840..80ba564e9b2a 100644 --- a/xmlsecurity/inc/xmlsec/errorcallback.hxx +++ b/xmlsecurity/inc/xmlsec/errorcallback.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_ERRORCALLBACK_HXX -#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_ERRORCALLBACK_HXX +#pragma once #include <xsecxmlsecdllapi.h> @@ -28,6 +27,4 @@ void setErrorRecorder(); //void setErrorRecorder(const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& xTemplate); void clearErrorRecorder(); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx index af3d4ca259d1..a49ccef1894c 100644 --- a/xmlsecurity/inc/xmlsec/saxhelper.hxx +++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSEC_SAXHELPER_HXX +#pragma once #include <sal/config.h> @@ -83,6 +82,4 @@ class SAXHelper final } ; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index ed984cfa176e..8f5695d10dfe 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSEC_XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX +#pragma once #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp> #include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp> @@ -206,6 +205,4 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec/xmlsec_init.hxx b/xmlsecurity/inc/xmlsec/xmlsec_init.hxx index 6dc4de2a63cf..417acd288b3c 100644 --- a/xmlsecurity/inc/xmlsec/xmlsec_init.hxx +++ b/xmlsecurity/inc/xmlsec/xmlsec_init.hxx @@ -7,14 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSEC_INIT_HXX -#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSEC_INIT_HXX +#pragma once #include <xsecxmlsecdllapi.h> XSECXMLSEC_DLLPUBLIC void initXmlSec(); XSECXMLSEC_DLLPUBLIC void deInitXmlSec(); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx index c78b717f3964..6e3d506a4d00 100644 --- a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX -#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX +#pragma once #include <xsecxmlsecdllapi.h> @@ -37,6 +36,4 @@ int xmlRegisterStreamInputCallbacks( css::uno::Reference<css::xml::crypto::XUriBinding> const& aUriBinding); int xmlUnregisterStreamInputCallbacks(); -#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h index f0540c799b48..7f31e6f8f407 100644 --- a/xmlsecurity/inc/xmlsecuritydllapi.h +++ b/xmlsecurity/inc/xmlsecuritydllapi.h @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H -#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#pragma once #include <sal/types.h> @@ -18,6 +17,4 @@ #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/xsecxmlsecdllapi.h b/xmlsecurity/inc/xsecxmlsecdllapi.h index 2f1d8d7c3af4..36f8ad52acef 100644 --- a/xmlsecurity/inc/xsecxmlsecdllapi.h +++ b/xmlsecurity/inc/xsecxmlsecdllapi.h @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_INC_XSECXMLSECDLLAPI_H -#define INCLUDED_XMLSECURITY_INC_XSECXMLSECDLLAPI_H +#pragma once #include <sal/types.h> @@ -18,6 +17,4 @@ #define XSECXMLSEC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_XMLSECURITY_INC_XSECXMLSECDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |