summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2016-10-26 19:59:32 +0300
committerJustin Luth <justin_luth@sil.org>2016-11-07 15:56:10 +0000
commit07b1e1025653c05f6422278da793261cbff42c71 (patch)
tree573ff072b92402944e3f13f1051ee7d4afd63db4
parent9a6d9b2d7caa6d1ae4dd16ee0b8a8af03e9dd07f (diff)
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@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d9c7b0a01162254240a1328fa594991eccf6bc65) Reviewed-on: https://gerrit.libreoffice.org/30662 Reviewed-by: Justin Luth <justin_luth@sil.org>
-rw-r--r--sfx2/source/doc/docfile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f681bbfac815..a79286014bcc 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();