summaryrefslogtreecommitdiff
path: root/include/sot/storage.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 09:12:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 15:07:11 +0100
commitdbe94dd3b64e74f661ea7193d8e06ac91f1dd7b0 (patch)
treedec170dd91227733b7cec974da317fcc9edfa02d /include/sot/storage.hxx
parentedbb7a39c7a954f8c773e6bdf136e65b70299dd5 (diff)
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 <mike.kaganski@collabora.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sot/storage.hxx')
-rw-r--r--include/sot/storage.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 6a7e25af9dfb..cb1c0baa3938 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -56,7 +56,7 @@ public:
void CopyTo( SotStorageStream * pDestStm );
bool Commit();
bool SetProperty( const OUString& rName, const css::uno::Any& rValue );
- virtual sal_uInt64 remainingSize() override;
+ virtual sal_uInt64 TellEnd() override;
};
class BaseStorage;