Author: alg
Date: Wed Apr 23 16:20:16 2014
New Revision: 1589450
URL: http://svn.apache.org/r1589450
Log:
i124686 reuse already set font for interpreting the MetaFile action
META_TEXTRECT_ACTION correctly
Modified:
openoffice/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
Modified:
openoffice/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx?rev=1589450&r1=1589449&r2=1589450&view=diff
==============================================================================
---
openoffice/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
(original)
+++
openoffice/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
Wed Apr 23 16:20:16 2014
@@ -2127,9 +2127,14 @@ namespace
drawinglayer::primitive2d::Primitive2DSequence xSubContent;
{
rTargetHolders.Push();
- // #i# for
sub-Mteafile contents, do start with new, default render state
-
rPropertyHolders.PushDefault();
-
interpretMetafile(aGDIMetaFile, rTargetHolders, rPropertyHolders,
rViewInformation);
+
+ // for sub-Mteafile contents, do start with
new, default render state
+ // #124686# ...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();
rTargetHolders.Pop();
