commit be7d87bea2611eb316b9b379aebc031179d4f794
author Andrzej J.R. Hunt <andrzej.hunt@collabora.com> Thu Dec 05 11:36:53 2013 +0000
committer Andrzej J.R. Hunt <andrzej.hunt@collabora.com> Thu Dec 05 12:32:04 2013 +0000
tree bcf685e68fbfb869082b63115eec99c24d0b57d9
parent fb9d14f6a6deb00ecd09288e5696e8df7f8f5c0e

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

vcl/source/gdi/gdimtf.cxx

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 820f2a0..1d89dea 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2765,6 +2765,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 );
            }