sfx2/source/doc/docfile.cxx | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 0a221dc654062c9bb282ab520e1b7a93d94227e1
Author: Michael Stahl <[email protected]>
AuthorDate: Wed Dec 13 19:49:23 2023 +0100
Commit: Michael Stahl <[email protected]>
CommitDate: Thu Dec 14 09:09:10 2023 +0100
sfx2: remove wrong asserts
Mike Kaganski points out that "soffice -n anything.docx" triggers the
one in GetOutStream(), called from SfxMedium::CreateTempFile()
!bTransferSuccess path, so the assumption of which parts of SfxMedium
can be in use concurrently was wrong.
Change-Id: I40f321d71297cadcdf4bf9ba6f07c4db3d2ac523
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160712
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit df23f570536c939ab4b44125ac8f62a8500e6f7c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160693
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 411c980b6e09..d75e25e530c3 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -677,7 +677,6 @@ bool SfxMedium::IsSkipImages() const
SvStream* SfxMedium::GetInStream()
{
- //assert(!pImpl->xStorage); // either SvStream or Storage
if ( pImpl->m_pInStream )
return pImpl->m_pInStream.get();
@@ -748,7 +747,6 @@ void SfxMedium::CloseInStream_Impl(bool bInDestruction)
SvStream* SfxMedium::GetOutStream()
{
- assert(!pImpl->xStorage); // either SvStream or Storage
if ( !pImpl->m_pOutStream )
{
// Create a temp. file if there is none because we always
@@ -1759,7 +1757,6 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage(
bool bCreateTempFile )
if ( pImpl->xStorage.is() || pImpl->m_bTriedStorage )
return pImpl->xStorage;
- assert(!pImpl->m_pOutStream /*&& !pImpl->m_pInStream*/); // either
SvStream or Storage
uno::Sequence< uno::Any > aArgs( 2 );
auto pArgs = aArgs.getArray();
