oox/source/helper/graphichelper.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f88d51e1f27896e5339033671bac158d2436abcf
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Sun Jul 14 20:21:08 2019 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon Jul 15 14:14:03 2019 +0200
tdf#126310 Disable lazy loading of WMF images
Change-Id: I70d271e29bedc640cbfeab187ddb9ffce3e779e6
Reviewed-on: https://gerrit.libreoffice.org/75599
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit 184a4771dad448a37f80b29bc62ad62e0a6a4bb6)
Reviewed-on: https://gerrit.libreoffice.org/75614
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
(cherry picked from commit 1c04b5c97ca3b12e52ec55572da77f7b6636e34c)
Reviewed-on: https://gerrit.libreoffice.org/75623
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index bb8d0d9a1929..00b805d61803 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -343,9 +343,9 @@ Reference< XGraphic > GraphicHelper::importEmbeddedGraphic(
const OUString& rStr
EmbeddedGraphicMap::const_iterator aIt = maEmbeddedGraphics.find(
rStreamName );
if( aIt == maEmbeddedGraphics.end() )
{
- // Lazy-loading doesn't work with TIFF at the moment.
+ // Lazy-loading doesn't work with TIFF or WMF at the moment.
WmfExternal aHeader;
- if (rStreamName.endsWith(".tiff") && !pExtHeader)
+ if ( (rStreamName.endsWith(".tiff") ||
rStreamName.endsWith(".wmf") ) && !pExtHeader)
pExtHeader = &aHeader;
xGraphic = importGraphic(mxStorage->openInputStream(rStreamName),
pExtHeader);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
