diff options
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 3d23f50bc141..3830b11c9d4a 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -604,13 +604,26 @@ SvStream* SfxMedium::GetOutStream() if ( pImp->pTempFile ) { - // don't try to re-use XOutStream from xStream if that exists; + // On windows we try to re-use XOutStream from xStream if that exists; + // because opening new SvFileStream in this situation may fail with ERROR_SHARING_VIOLATION + #ifdef WNT + if (pImp->xStream.is()) + { + assert(pImp->xStream->getOutputStream().is()); // need that... + pImp->m_pOutStream = utl::UcbStreamHelper::CreateStream( + pImp->xStream, false); + } + else + { + pImp->m_pOutStream = new SvFileStream( + pImp->m_aName, STREAM_STD_READWRITE); + } + // On Unix don't try to re-use XOutStream from xStream if that exists; // it causes fdo#59022 (fails opening files via SMB on Linux) - // OTOH opening new SvFileStream in this situation may fail on - // Windows with ERROR_SHARING_VIOLATION... but that is apparently - // not a problem in practice currently + #else pImp->m_pOutStream = new SvFileStream( pImp->m_aName, STREAM_STD_READWRITE); + #endif CloseStorage(); } } |