summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-04-23 16:20:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-04-24 15:03:08 +0100
commit7cf38082fd797b316d0f8b3e8227244362755efd (patch)
treec601890b586b124b4c3e47813562bb148dcfad45 /drawinglayer
parent121aac37673c1a8142db01e26e50be6de7b36987 (diff)
Resolves: #i124686# reuse already set font for interpreting...
the MetaFile action META_TEXTRECT_ACTION correctly (cherry picked from commit 7ce0a0a7680255159beae7726ec63d539ef0c7f9) Change-Id: If802a58ae0fb38292d5a875d85448cc2c3967066
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index ab098adec856..46d44670f6c3 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2116,8 +2116,13 @@ namespace
drawinglayer::primitive2d::Primitive2DSequence xSubContent;
{
rTargetHolders.Push();
- // #i# for sub-Mteafile contents, do start with new, default render state
+
+ // for sub-Mteafile contents, do start with new, default render state
+ // #i124686# ...but copy font, this is already set accordingly
+ const Font& rTargetFont = rPropertyHolders.Current().getFont();
rPropertyHolders.PushDefault();
+ rPropertyHolders.Current().setFont(rTargetFont);
+
interpretMetafile(aGDIMetaFile, rTargetHolders, rPropertyHolders, rViewInformation);
xSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
rPropertyHolders.Pop();