diff options
Diffstat (limited to 'include/oox/crypto')
-rw-r--r-- | include/oox/crypto/AgileEngine.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/CryptTools.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/CryptoEngine.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/DocumentDecryption.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/DocumentEncryption.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 6 | ||||
-rw-r--r-- | include/oox/crypto/StrongEncryptionDataSpace.hxx | 7 |
7 files changed, 14 insertions, 29 deletions
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index ac028533d71c..ece492871163 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -24,8 +24,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { struct OOX_DLLPUBLIC AgileEncryptionInfo { @@ -141,8 +140,7 @@ public: bool setupEncryptionKey(OUString const & rPassword); }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index 31d90efcbc49..c8c1420079bd 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -26,8 +26,7 @@ #include <vector> #include <memory> -namespace oox { -namespace crypto { +namespace oox::crypto { /** Rounds up the input to the nearest multiple * @@ -114,8 +113,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx index 72bde8920dfc..49009ac7e2c1 100644 --- a/include/oox/crypto/CryptoEngine.hxx +++ b/include/oox/crypto/CryptoEngine.hxx @@ -24,8 +24,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { class CryptoEngine { @@ -60,8 +59,7 @@ public: virtual bool checkDataIntegrity() = 0; }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index 2db38b442386..33cab866f40e 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -26,8 +26,7 @@ namespace com::sun::star { namespace oox::ole { class OleStorage; } -namespace oox { -namespace crypto { +namespace oox::crypto { class DocumentDecryption { @@ -48,8 +47,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx index 72173f188a07..c2a3bd4ed5c2 100644 --- a/include/oox/crypto/DocumentEncryption.hxx +++ b/include/oox/crypto/DocumentEncryption.hxx @@ -23,8 +23,7 @@ namespace com::sun::star { namespace oox::ole { class OleStorage; } -namespace oox { -namespace crypto { +namespace oox::crypto { class DocumentEncryption { @@ -46,8 +45,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 4a6eaae9e43c..8a7aec3e66af 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -22,8 +22,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { class OOX_DLLPUBLIC Standard2007Engine final : public CryptoEngine { @@ -55,8 +54,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx index 40fd6f79e1e0..f3fcff9edaab 100644 --- a/include/oox/crypto/StrongEncryptionDataSpace.hxx +++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx @@ -23,9 +23,7 @@ namespace com::sun::star::uno class XComponentContext; } -namespace oox -{ -namespace crypto +namespace oox::crypto { class StrongEncryptionDataSpace final : public cppu::WeakImplHelper<css::lang::XServiceInfo, css::packages::XPackageEncryption> @@ -68,8 +66,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif |