diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-05 00:42:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-09 09:59:01 +0000 |
| commit | a93f26304e21e257aaf6914e0f8607c80fb912af (patch) | |
| tree | 8cd904bb8c97b65c5d40cc9ff115038c3683375c /basic | |
| parent | 26738bfce8156bf7aedeced3ba55e20e9383be7c (diff) | |
basic: tdf#87530 if a new password is set, must set mbLoadedSource flag
... so that the library is stored (and encrypted), and not copied
unencrypted from source storage.
Change-Id: I9546087ec6f07007aa1ec377d2e959f2bae99a38
(cherry picked from commit 6a351c5cf91d0f667168d834ba2eb5c04121c7d5)
Reviewed-on: https://gerrit.libreoffice.org/23041
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/uno/scriptcont.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 84ee6f68f4a0..a8fb044921f1 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -94,6 +94,11 @@ void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName pImplLib->mbDoc50Password = true; pImplLib->mbPasswordProtected = true; pImplLib->maPassword = rPassword; + SfxScriptLibrary *const pSL(dynamic_cast<SfxScriptLibrary *>(pImplLib)); + if (pSL && pSL->mbLoaded) + { + pSL->mbLoadedSource = true; // must store source code now! + } } } catch(const NoSuchElementException& ) {} @@ -486,6 +491,11 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& pImplLib->mbPasswordProtected = true; pImplLib->mbPasswordVerified = true; pImplLib->maPassword = NewPassword; + SfxScriptLibrary *const pSL(dynamic_cast<SfxScriptLibrary *>(pImplLib)); + if (pSL && pSL->mbLoaded) + { + pSL->mbLoadedSource = true; // must store source code now! + } maModifiable.setModified( true ); pImplLib->implSetModified( true ); |