commit 1c04b5c97ca3b12e52ec55572da77f7b6636e34c
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Sun Jul 14 20:21:08 2019 +0200
committer Xisco Faulí <xiscofauli@libreoffice.org> Mon Jul 15 12:05:35 2019 +0200
tree 86021af0b33a59f2e9655239345de2018285ec60
parent 825dd44bb6a2093fec875f521f3dfdff6de51ac0

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 <vmiklos@collabora.com>
(cherry picked from commit 184a4771dad448a37f80b29bc62ad62e0a6a4bb6)
Reviewed-on: https://gerrit.libreoffice.org/75614
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

oox/source/helper/graphichelper.cxx

diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 6ada6cd..8e56f58 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -355,9 +355,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);