diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-10-26 19:59:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-11-13 11:04:04 +0200 |
| commit | b6354501a0b7689ea4e12f8c616a362f66af0988 (patch) | |
| tree | aa325e1770adfcddfa59b407447d583ed7d926d1 | |
| parent | tdf#103696 ensure glm always uses radians (diff) | |
| download | core-b6354501a0b7689ea4e12f8c616a362f66af0988.tar.gz core-b6354501a0b7689ea4e12f8c616a362f66af0988.zip | |
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.cxx | 3 |
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(); |