[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sfx2/source

Guillaume Smaha gsmaha at linagora.com
Tue May 31 22:17:11 UTC 2016


 sfx2/source/doc/objstor.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 127c56b0501b90283c0bb2f0a06ba242186bc1ca
Author: Guillaume Smaha <gsmaha at linagora.com>
Date:   Thu Apr 14 12:36:52 2016 +0200

    tdf#96097: Can't save a doc with signed macro after autosave/save a copy
    
    Change-Id: Icc886a8d228cb786c6f318cfa2556ef113c553eb
    Reviewed-on: https://gerrit.libreoffice.org/24081
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit d7ef7e3e4bc9c6277e5b2d08c2657fea8cf0e639)
    Reviewed-on: https://gerrit.libreoffice.org/24461
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index cbb3c8c..f8116d7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1594,8 +1594,6 @@ bool SfxObjectShell::SaveTo_Impl
 
                 if ( !aScriptSignName.isEmpty() )
                 {
-                    pMedium->Close();
-
                     // target medium is still not committed, it should not be closed
                     // commit the package storage and close it, but leave the streams open
                     rMedium.StorageCommit_Impl();
@@ -1653,7 +1651,6 @@ bool SfxObjectShell::SaveTo_Impl
             {
             }
 
-            pMedium->Close();
             rMedium.CloseZipStorage_Impl();
         }
 


More information about the Libreoffice-commits mailing list