summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-15 11:05:07 +0200
committerNoel Grandin <noel@peralex.com>2016-03-15 11:07:42 +0200
commitc5bee7b8c1055e5052a261c8755bdb150fb27494 (patch)
tree1c1f5de891583f0430806ad18c2a3012cf646c88
parent73443fd278811837650160482c34c15e8830f0d3 (diff)
tdf#98600 and tdf#98622 fix metafile parsing
regression from commit db17d3c1 "new loplugin: memoryvar" Change-Id: I8b11871cadcf50649533680be51c767d6bb98350
-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 0fea0d01f669..4920f90dfb39 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2772,6 +2772,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();