summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2012-12-14 12:09:36 +0100
committerRadek Doulik <rodo@novell.com>2013-02-26 11:05:57 +0100
commitb50c8f2cbc477a784dec00be1a91e4743bd2cf8a (patch)
tree23dd2ae690be15404cbfdfd7e6911aaf74608f59
parent01f8d0a1dffce854a66c0f957e81e6df6d361a86 (diff)
fix emf+ rendering
Change-Id: Ib49898362f7e648a8ce9c27b5e5b4f0b2ad93afd
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx5
1 files 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;