diff options
author | Mikhail Voitenko <mav@openoffice.org> | 2009-11-25 12:25:48 +0000 |
---|---|---|
committer | Mikhail Voitenko <mav@openoffice.org> | 2009-11-25 12:25:48 +0000 |
commit | 609f0d0f0f49b8b145e018408ad038ab4dc235d9 (patch) | |
tree | 8f3ac63ae4cd89770254ddfa1fd0ec0631b8b0c0 /package | |
parent | a92312c2256c52910216824e27ad37a4bbe430df (diff) |
#i107047# let the temporary stream be flushed in time
Diffstat (limited to 'package')
-rw-r--r-- | package/source/xstor/owriteablestream.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 1cfb419db6d8..4f3a912b8c0b 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -851,6 +851,9 @@ void OWriteStream_Impl::Commit() if ( m_xCacheStream.is() ) { + if ( m_pAntiImpl ) + m_pAntiImpl->DeInit(); + uno::Reference< io::XInputStream > xInStream( m_xCacheStream->getInputStream(), uno::UNO_SET_THROW ); xNewPackageStream = uno::Reference< packages::XDataSinkEncrSupport >( @@ -862,11 +865,12 @@ void OWriteStream_Impl::Commit() m_xCacheStream = uno::Reference< io::XStream >(); m_xCacheSeek = uno::Reference< io::XSeekable >(); - if ( m_pAntiImpl ) - m_pAntiImpl->DeInit(); } else if ( m_aTempURL.getLength() ) { + if ( m_pAntiImpl ) + m_pAntiImpl->DeInit(); + uno::Reference< io::XInputStream > xInStream; try { @@ -886,9 +890,6 @@ void OWriteStream_Impl::Commit() // TODO/NEW: Let the temporary file be removed after commit xNewPackageStream->setDataStream( xInStream ); m_aTempURL = ::rtl::OUString(); - - if ( m_pAntiImpl ) - m_pAntiImpl->DeInit(); } else // if ( m_bHasInsertedStreamOptimization ) { |