[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Noel Grandin]

 vcl/source/gdi/gdimtf.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ceedd3c624873cd5dbdd76456a1540560a128a01
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Mar 15 11:05:07 2016 +0200

    tdf#98600 and tdf#98622 fix metafile parsing
    
    regression from commit db17d3c1 "new loplugin: memoryvar"
    
    Change-Id: I8b11871cadcf50649533680be51c767d6bb98350
    (cherry picked from commit c5bee7b8c1055e5052a261c8755bdb150fb27494)
    Reviewed-on: https://gerrit.libreoffice.org/23469
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 21d1f11..581fa51 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2763,6 +2763,8 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
             ReadPair( rIStm, rGDIMetaFile.aPrefSize );
             rIStm.ReadUInt32( nCount );
 
+            pCompat.reset(); // needs to be deleted here for the parsing to work correctly
+
             ImplMetaReadData aReadData;
             aReadData.meActualCharSet = rIStm.GetStreamCharSet();