diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-26 13:48:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-02 12:09:33 +0100 |
| commit | cdfad2dbbf180d3c556964c7aa8e0bb3b299d5e3 (patch) | |
| tree | 8252bde9d7999015245ed0e64c533e72c0b211d7 /sfx2/source/doc/objstor.cxx | |
| parent | 4314e6548356a5d2f1dc45e2aa501e37bd5a794e (diff) | |
Resolves: #i119366# ensure password can be removed via "Save As..."
Found by: DonJaime <donjaime at freenet dot de>
Patch by: zhengfan <zheng.easyfan at gmail dot com>
Review by: Oliver <orw at apache dot org>
(cherry picked from commit 9957730bb807c6d81f243e14a19cbb6a91035194)
Conflicts:
sfx2/source/doc/sfxbasemodel.cxx
Change-Id: I93bfdd7f32671171f1b219f9fd2dbeac30a92254
Diffstat (limited to 'sfx2/source/doc/objstor.cxx')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index b92a10a048df..c57c79a45549 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2749,6 +2749,9 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty ) pMergedParams->ClearItem( SID_ENCRYPTIONDATA ); pMergedParams->ClearItem( SID_PASSWORD ); + // #i119366# - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for setting password together, we need to clear them both. + // Also, ( maybe the new itemset contains new values, otherwise they will be empty ) + pMergedParams->ClearItem( SID_ENCRYPTIONDATA ); pMergedParams->ClearItem( SID_DOCINFO_TITLE ); pMergedParams->ClearItem( SID_INPUTSTREAM ); |