From b50c8f2cbc477a784dec00be1a91e4743bd2cf8a Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Fri, 14 Dec 2012 12:09:36 +0100
Subject: fix emf+ rendering

Change-Id: Ib49898362f7e648a8ce9c27b5e5b4f0b2ad93afd
---
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index b78ac5b1e8df..f9d583d05fb8 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1631,8 +1631,9 @@ namespace drawinglayer
                 case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
                 {
                     static bool bUseMetaFilePrimitiveDecomposition(true);
+                    const primitive2d::MetafilePrimitive2D& aMetafile = static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate);
 
-                    if(bUseMetaFilePrimitiveDecomposition)
+                    if(bUseMetaFilePrimitiveDecomposition && !aMetafile.getMetaFile().GetUseCanvas())
                     {
                         // use new Metafile decomposition
                         process(rCandidate.get2DDecomposition(getViewInformation2D()));
@@ -1640,7 +1641,7 @@ namespace drawinglayer
                     else
                     {
                         // direct draw of MetaFile, use default pocessing
-                        RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate));
+                        RenderMetafilePrimitive2D(aMetafile);
                     }
 
                     break;
-- 
cgit v1.2.3