diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-09-14 13:52:58 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-09-15 15:34:16 +0200 |
| commit | 13aedd1d0ec1ef4c5687c207eb1d9c986c1299d9 (patch) | |
| tree | 79be0a561b2d6892158c67512b2e1ea71a7094b3 /include | |
| parent | e0a43dff646515bbbcd2099b6fc095a7a89b84f9 (diff) | |
Save should encrypt OOXML document if it was loaded encrypted.
Currently Agile encryption is not supported, so all documents
loaded with "agile" encryption will be encrypted with "standard"
encryption when they are saved afterwards.
Change-Id: Id0477f43c00ed70032ca6b3390eebb1105d5ffa7
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/crypto/DocumentDecryption.hxx | 2 | ||||
| -rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index 768cdbf6b275..1502c41f3d6e 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -59,7 +59,7 @@ public: bool readEncryptionInfo(); bool generateEncryptionKey(const OUString& rPassword); - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(); + com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword); static bool checkEncryptionData( const com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue >& rEncryptionData ); }; diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index c53ec22cd124..563a7105b5fa 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -89,11 +89,6 @@ public: StandardEncryptionInfo& getInfo(); - static bool checkEncryptionData( - std::vector<sal_uInt8> key, sal_uInt32 keySize, - std::vector<sal_uInt8> encryptedVerifier, sal_uInt32 verifierSize, - std::vector<sal_uInt8> encryptedHash, sal_uInt32 hashSize ); - virtual bool generateEncryptionKey(const OUString& rPassword); virtual bool writeEncryptionInfo( |