diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-05 18:31:41 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-07 21:32:05 +0100 |
| commit | 1238ca8d100c107656b707ed3a6b662f0a1867fb (patch) | |
| tree | 747bc2540a56ee469b788b4ae6d97ffe79e5d62e /oox | |
| parent | ce507a14c551b9d2ce64c5cf1580431bb04b01a0 (diff) | |
Revert "tdf#126310 Disable lazy loading of WMF images"
This reverts commit 184a4771dad448a37f80b29bc62ad62e0a6a4bb6.
Reason for revert: The problem is no longer reproducible as described
here: https://bugs.documentfoundation.org/show_bug.cgi?id=138515#c3
It also needs to be reverted in order to get tdf#138515 fixed,
although it doesn't fix the problem
Change-Id: I7bb678f1a19ae3609064449cfc5e71e0ba8c9de2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111931
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/helper/graphichelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 82978a76451e..17cf66c92e44 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -301,9 +301,9 @@ Reference< XGraphic > GraphicHelper::importEmbeddedGraphic( const OUString& rStr xGraphic = mxGraphicMapper->findGraphic(rStreamName); if (!xGraphic.is()) { - // Lazy-loading doesn't work with TIFF or WMF at the moment. + // Lazy-loading doesn't work with TIFF at the moment. WmfExternal aHeader; - if ( (rStreamName.endsWith(".tiff") || rStreamName.endsWith(".wmf") ) && !pExtHeader) + if (rStreamName.endsWith(".tiff") && !pExtHeader) pExtHeader = &aHeader; auto xStream = mxStorage->openInputStream(rStreamName); |