[Libreoffice-commits] .: sfx2/source

[Markus Mohrhard]

 sfx2/source/doc/objstor.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 376b9eb7525381cbf9334b4148dba0261de4d8cc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 28 18:51:13 2011 +0200

    fix merge problem

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 415f731..31ee8f0 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 );