[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/doc/objcont.cxx |    2 +-
 sfx2/source/doc/objserv.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6a580673570f634d7b50703eeccdbd4b3f85743
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Oct 18 11:27:11 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon Oct 21 09:57:21 2019 +0200

    Don't create unnecessary tempfiles for opened doc
    
    A copy of the doc was created for each opened file as a temp file.
    Try to avoid that.
    
    Change-Id: I11db2a9c8d77b954de56a6e977b1555c8f876416
    Reviewed-on: https://gerrit.libreoffice.org/81031
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 9112c18524c9f5e67d6cbb282586a439e3020cdb)
    Reviewed-on: https://gerrit.libreoffice.org/81200
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index ecc131177fb9..8837e9fb82a7 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -404,7 +404,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
     // tdf#113935 - do not remove this line - somehow, it makes the process
     // of switching from viewing a read-only document to opening it in writable
     // mode much faster.
-    uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage();
+    uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage(false);
 
     // only for own storage formats
     if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 813a1e251674..bff9327367b7 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1619,7 +1619,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::GetDocum
                                                                 uno::Reference< io::XInputStream >() );
             else
             {
-                if (GetMedium()->GetStorage().is())
+                if (GetMedium()->GetStorage(false).is())
                 {
                     // Something ZIP-based.
                     // Only call into xmlsecurity if we see a signature stream,