diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:35:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:35:36 +0200 |
| commit | df4a9e498cedc2b466c9e3d00ad3f9e9c16ff777 (patch) | |
| tree | 52e1f9113b39361e17dd9cc1e487734840dfb9a5 /sfx2 | |
| parent | 625ddeb48632ab60a09a9cf7a109e7f00afcacf2 (diff) | |
| parent | 8890525dfac103a0e1f00aacef7b68bb13a9e34a (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
desktop/source/app/app.cxx
desktop/source/app/dispatchwatcher.cxx
desktop/unx/source/splashx.c
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/source/bastyp/fltfnc.cxx
Diffstat (limited to 'sfx2')
| -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 49f4b211010d..7c2deb768688 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 ); |