diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-18 11:17:53 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-01-18 09:14:00 +0100 |
| commit | f22b4c63cfb09bd38c502a650775b0d27b50b480 (patch) | |
| tree | 43bc37fd0cd17241bd28f162e53cbcc305d0118d /include | |
| parent | f55352d5e79980c358653d18008ac047dc3e0118 (diff) | |
do not preload all images in the pptx importer
Now with my GraphicFilter::MakeGraphicsAvailableThreaded() patches
for Impress images will be loaded in parallel as they are needed,
which should usually be more efficient than loading all of them
immediately.
This basically reverts commits:
b1319842a49cdf6512bbd9e81081e2a9edbd6089
04e27df3c162f1df02f061b94434a38d1eaa3a46
9eb8e2737d3a4d52ce1b0cc44091a3b7ecf59e3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107945
Tested-by: Luboš Luňák <l.lunak@collabora.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit afa3dff9c7b963f1d312ef8c2efcbc8ab7271e62)
Change-Id: I46bb0d6d93fb69f03f464308f6fce1603aafdfd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109393
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/graphichelper.hxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index d9d274b70377..27b8b3c86e77 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -113,10 +113,6 @@ public: const css::uno::Reference< css::io::XInputStream >& rxInStrm, const WmfExternal* pExtHeader = nullptr ) const; - /** Imports graphics from the passed input streams. */ - std::vector< css::uno::Reference<css::graphic::XGraphic> > - importGraphics(const std::vector< css::uno::Reference<css::io::XInputStream> >& rStreams) const; - /** Imports a graphic from the passed binary memory block. */ css::uno::Reference< css::graphic::XGraphic > importGraphic( const StreamDataSequence& rGraphicData ) const; @@ -127,9 +123,6 @@ public: const OUString& rStreamName, const WmfExternal* pExtHeader = nullptr ) const; - /** Imports graphics from the storage with the passed stream names. */ - void importEmbeddedGraphics(const std::vector<OUString>& rStreamNames) const; - /** calculates the original size of a graphic which is necessary to be able to calculate cropping values @return The original Graphic size in 100thmm */ css::awt::Size getOriginalSize( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const; |