summaryrefslogtreecommitdiffstats
path: root/drawinglayer/source/tools/emfphelperdata.hxx
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2018-04-15 02:00:16 +0200
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-04-17 23:40:24 +0200
commita2851d562cdfaf06e5f767030677846f3f129b1c (patch)
tree7bf90541012a3fa3a61cedf6e91f6ac7272e12ee /drawinglayer/source/tools/emfphelperdata.hxx
parentNB Implementation: sync impress label with writer/calc (diff)
downloadcore-a2851d562cdfaf06e5f767030677846f3f129b1c.tar.gz
core-a2851d562cdfaf06e5f767030677846f3f129b1c.zip
tdf#117015 EMF+ Fix for displaying EMF+ files where GetDC is used
With EMF+ Only mode, still the EMF records could be used for displaying objects, by using Get Device Context (GetDC). Files identified as EMF+ Only can contain both EMF+ records and EMF records. All EMF+ records are used to render the image. The EMF records that are part of the drawing are those preceded by a Get Device Context record. Unfortunately after finishing EMF drawing, the clip region was not reset. As a result records after EMF record was not displayed. With this patch, the issue was fixed by resetting clip region. Change-Id: I998b14e7c3b56a7711ba6a7bec08ec2097e0dfce Reviewed-on: https://gerrit.libreoffice.org/52897 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'drawinglayer/source/tools/emfphelperdata.hxx')
-rw-r--r--drawinglayer/source/tools/emfphelperdata.hxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx
index e5402d1fe267..281a5f7ebbba 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -171,6 +171,7 @@ namespace emfplushelper
/// data holders
wmfemfhelper::TargetHolders& mrTargetHolders;
wmfemfhelper::PropertyHolders& mrPropertyHolders;
+ bool bIsGetDCProcessing;
// readers
void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_uInt32 dataSize, bool bUseWholeStream = false);