diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-03 17:45:57 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-03 22:12:15 +0100 |
commit | d8efc393bff9c0ed38eac00f48ce1d525e1d08ce (patch) | |
tree | c444f68ae5facfcad0b9bb411020592be601e562 /xmlsecurity/inc | |
parent | e11ff5a47a5e82de797e78e60f88acd9ff446149 (diff) |
Turn on clang-format for these files
I (tried to) keep these files consistent locally with astyle in the past,
switching to clang-format makes sure that the recent problem with introducing
inconsistencies with automatic loplugin rewrites doesn't happen again.
Change-Id: If49c96b6e9e6ed50beb69c70e37125dff5607f76
Reviewed-on: https://gerrit.libreoffice.org/47332
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r-- | xmlsecurity/inc/documentsignaturemanager.hxx | 9 | ||||
-rw-r--r-- | xmlsecurity/inc/pdfsignaturehelper.hxx | 9 |
2 files changed, 11 insertions, 7 deletions
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index 8a3837ded39b..50f683a35850 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -42,7 +42,7 @@ public: std::unique_ptr<PDFSignatureHelper> mpPDFSignatureHelper; SignatureInformations maCurrentSignatureInformations; DocumentSignatureMode meSignatureMode; - css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > m_manifest; + css::uno::Sequence<css::uno::Sequence<css::beans::PropertyValue>> m_manifest; css::uno::Reference<css::io::XStream> mxSignatureStream; css::uno::Reference<css::io::XStream> mxTempSignatureStream; /// Storage containing all OOXML signatures, unused for ODF. @@ -52,7 +52,8 @@ public: css::uno::Reference<css::xml::crypto::XSEInitializer> mxGpgSEInitializer; css::uno::Reference<css::xml::crypto::XXMLSecurityContext> mxGpgSecurityContext; - DocumentSignatureManager(const css::uno::Reference<css::uno::XComponentContext>& xContext, DocumentSignatureMode eMode); + DocumentSignatureManager(const css::uno::Reference<css::uno::XComponentContext>& xContext, + DocumentSignatureMode eMode); ~DocumentSignatureManager(); /** * Checks if a particular stream is a valid xml stream. Those are treated @@ -81,8 +82,8 @@ public: /// Get the security environment. css::uno::Reference<css::xml::crypto::XSecurityEnvironment> getSecurityEnvironment(); css::uno::Reference<css::xml::crypto::XSecurityEnvironment> getGpgSecurityEnvironment(); - css::uno::Reference<css::xml::crypto::XXMLSecurityContext> const & getSecurityContext(); - css::uno::Reference<css::xml::crypto::XXMLSecurityContext> const & getGpgSecurityContext(); + css::uno::Reference<css::xml::crypto::XXMLSecurityContext> const& getSecurityContext(); + css::uno::Reference<css::xml::crypto::XXMLSecurityContext> const& getGpgSecurityContext(); }; #endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx index 392331832963..95df24c1abc1 100644 --- a/xmlsecurity/inc/pdfsignaturehelper.hxx +++ b/xmlsecurity/inc/pdfsignaturehelper.hxx @@ -32,8 +32,10 @@ class XMLSECURITY_DLLPUBLIC PDFSignatureHelper public: PDFSignatureHelper(); bool ReadAndVerifySignature(const css::uno::Reference<css::io::XInputStream>& xInputStream); - css::uno::Sequence<css::security::DocumentSignatureInformation> GetDocumentSignatureInformations(const css::uno::Reference<css::xml::crypto::XSecurityEnvironment>& xSecEnv) const; - SignatureInformations const & GetSignatureInformations() const; + css::uno::Sequence<css::security::DocumentSignatureInformation> + GetDocumentSignatureInformations( + const css::uno::Reference<css::xml::crypto::XSecurityEnvironment>& xSecEnv) const; + SignatureInformations const& GetSignatureInformations() const; /// Return the ID of the next created signature. sal_Int32 GetNewSecurityId() const; @@ -44,7 +46,8 @@ public: /// Append a new signature at the end of xInputStream. bool Sign(const css::uno::Reference<css::io::XInputStream>& xInputStream, bool bAdES); /// Remove the signature at nPosition (and all dependent signatures) from xInputStream. - static bool RemoveSignature(const css::uno::Reference<css::io::XInputStream>& xInputStream, sal_uInt16 nPosition); + static bool RemoveSignature(const css::uno::Reference<css::io::XInputStream>& xInputStream, + sal_uInt16 nPosition); }; #endif // INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX |