diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-28 18:51:13 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-28 18:51:13 +0200 |
| commit | 035c630f4d07d440fa793bd09061bdf5c743e86b (patch) | |
| tree | f918c1d91c7516fd5aa3aa451bd61848482bbd6d /sfx2/source/doc/objstor.cxx | |
| parent | f286a6f84b6f55bf4505a334e1d666c591c5dd2a (diff) | |
fix merge problem
Diffstat (limited to 'sfx2/source/doc/objstor.cxx')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 7c2deb768688..49f4b211010d 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2688,7 +2688,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl pMergedParams->ClearItem( SID_ENCRYPTIONDATA ); pMergedParams->ClearItem( SID_PASSWORD ); pMergedParams->ClearItem( SID_DOCINFO_TITLE ); - pMergedParams->ClearItem( SID_ENCRYPTIONDATA ); + pMergedParams->ClearItem( SID_INPUTSTREAM ); pMergedParams->ClearItem( SID_STREAM ); pMergedParams->ClearItem( SID_CONTENT ); |