summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej.hunt@collabora.com>2013-12-05 11:36:53 +0000
committerAndrzej J.R. Hunt <andrzej.hunt@collabora.com>2013-12-05 12:41:23 +0000
commitd209348d849aa6e4c01ed0928186e50c466e8c67 (patch)
treec2c41c9d572354e47c7c1e018ba5d8933102e334
parent1531f609673a1fdce18648f1ee0ab04e0432914c (diff)
EMF+: force canvas if EMF+ comments are used.
Without this the drawinglayer renderer is used, whereas only the canvas renderer supports EMF+. Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437 (cherry picked from commit be7d87bea2611eb316b9b379aebc031179d4f794)
-rw-r--r--vcl/source/gdi/gdimtf.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 0b6daac6249f..7b4c91b2e66b 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2896,6 +2896,13 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
{
pAction = MetaAction::ReadMetaAction( rIStm, &aReadData );
+ if (pAction->GetType() == META_COMMENT_ACTION)
+ {
+ MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
+ if ( pCommentAct->GetComment() == "EMF_PLUS" )
+ rGDIMetaFile.UseCanvas( sal_True );
+ }
+
if( pAction )
rGDIMetaFile.AddAction( pAction );
}