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

[Justin Luth]

 sfx2/source/doc/docfile.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 07b1e1025653c05f6422278da793261cbff42c71
Author: Justin Luth <justin_luth at sil.org>
Date:   Wed Oct 26 19:59:32 2016 +0300

    tdf#62625 - reopen temp stream to readBasic .xls VBA
    
    InputStream was closed, but an InStream was still open,
    so InputStream was not being re-created.
    Apparently either most web protocols aren't properly closed,
    or else a second stream is needed for these kinds of protocols.
    
    Required on Linux for INetProtocol::Http, Generic, Smb, Sftp
    and perhaps more.  Required on Windows/Mac for Remote WebDAV
    (although http://xx/xx.xls worked)
    
    Change-Id: Icb732518fb8185168c5ed1cb9e32c84c9d8d71bb
    Reviewed-on: https://gerrit.libreoffice.org/30303
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit d9c7b0a01162254240a1328fa594991eccf6bc65)
    Reviewed-on: https://gerrit.libreoffice.org/30662
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f681bbf..a792860 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2368,7 +2368,8 @@ void SfxMedium::GetLockingStream_Impl()
 
 void SfxMedium::GetMedium_Impl()
 {
-    if ( !pImpl->m_pInStream )
+    if ( !pImpl->m_pInStream
+        || (pImpl->bIsTemp && !pImpl->xInputStream.is() && !pImpl->m_xInputStreamToLoadFrom.is() && !pImpl->xStream.is() && !pImpl->m_xLockingStream.is() ) )
     {
         pImpl->bDownloadDone = false;
         Reference< css::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler();