diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-14 09:42:02 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-25 09:52:58 +0000 |
| commit | 7e1d17f1ba3776da70db40d6d1a518dcf3238860 (patch) | |
| tree | 57101d71a7afde06ddd70077eb264b81e58ffbe9 | |
| parent | 027e8b126b85d1c7abf458f2b37b61f76e7d3d47 (diff) | |
fdo#51819: autorecovery: fix saving password in protected documents.
Thanks to sayt@mailinator.com for the idea.
Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c
(cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219)
Reviewed-on: https://gerrit.libreoffice.org/8676
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8a32d789e7af..3a18af4edebe 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2305,9 +2305,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString& // if the document was loaded with a password, it should be // stored with password utl::MediaDescriptor lNewArgs; - OUString sPassword = lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), OUString()); - if (!sPassword.isEmpty()) - lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] <<= sPassword; + css::uno::Sequence< css::beans::NamedValue > aEncryptionData = + lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA(), + css::uno::Sequence< css::beans::NamedValue >()); + if (aEncryptionData.getLength() > 0) + lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= aEncryptionData; // Further it must be saved using the default file format of that application. // Otherwhise we will some data lost. |