commit 184a4771dad448a37f80b29bc62ad62e0a6a4bb6
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Sun Jul 14 20:21:08 2019 +0200
committer Miklos Vajna <vmiklos@collabora.com> Mon Jul 15 09:58:07 2019 +0200
tree 735d4d65c0c2534d882437434c97d4a7605b9527
parent 3932c8184a8c93a17c0c7429d5dd9597b087e076

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>

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);