From dbe94dd3b64e74f661ea7193d8e06ac91f1dd7b0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 7 Nov 2018 09:12:23 +0200 Subject: tdf#120657 Pie chart saved as DOC doesn't preview in MSO regression from commit 9ec8bf8f22fe74884185492ef2576ce79b41e4f1 add SvStream::TellEnd the problem is that in this stack trace sot/source/sdstor/stgelem.hxx:130 sot/source/sdstor/stgdir.cxx:300 sot/source/sdstor/stg.cxx:245 sot/source/sdstor/storage.cxx:187 tools/source/stream/stream.cxx:1908 sw/source/filter/ww8/ww8scan.cxx:6267 The StgEntry returns a size of 0. If we do something else to the SotStorageStream first, then it materialises a temporary stream, and that stream returns a valid size. Also implement suggestions from mike kaganski: IMO, it would be more robust to implement this new function as virtual (instead of the remainingSize()), and reimplement the latter as non-virtual one using the new one and doing the necessary correction. Change-Id: Id1462d918570a684ec67099c30181436a27d3c6a Reviewed-on: https://gerrit.libreoffice.org/62984 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Noel Grandin --- sot/source/sdstor/storage.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sot') diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index cff3520264ba..bc78bddbbe04 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -181,12 +181,16 @@ sal_uInt32 SotStorageStream::GetSize() const return nSize; } -sal_uInt64 SotStorageStream::remainingSize() +sal_uInt64 SotStorageStream::TellEnd() { + // Need to flush the buffer so we materialise the stream and return the correct answer + // otherwise we return a 0 value from StgEntry::GetSize + FlushBuffer(true); + if (pOwnStm) - return pOwnStm->GetSize() - Tell(); + return pOwnStm->GetSize(); - return SvStream::remainingSize(); + return SvStream::TellEnd(); } void SotStorageStream::CopyTo( SotStorageStream * pDestStm ) -- cgit