summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-15 11:05:07 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-03-24 10:25:04 +0000
commitceedd3c624873cd5dbdd76456a1540560a128a01 (patch)
tree6535745b5db23811a6463f2e16dfcc085b897f42 /vcl
parentcedf39fcd2e18428b1e580f5e0e9e06c7eed2dee (diff)
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@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/gdimtf.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 21d1f112a641..581fa5156b86 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();