Kaydet (Commit) 21334f74 authored tarafından Caolán McNamara's avatar Caolán McNamara

Revert "give empty constructed default font a default height"

and make a real copy of the TargetFont

the 0,0 font size appears to mean "default" size so it can
take the desktop env font size or some such, with a hard-coded
value then the various "bold" entries in the UI are huge

This reverts commit 121aac37.

Change-Id: Iec1d3867403808370d89d6b5ad2fec60ffdcd881
üst 6643b783
......@@ -2119,9 +2119,9 @@ namespace
// 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();
Font aTargetFont = rPropertyHolders.Current().getFont();
rPropertyHolders.PushDefault();
rPropertyHolders.Current().setFont(rTargetFont);
rPropertyHolders.Current().setFont(aTargetFont);
interpretMetafile(aGDIMetaFile, rTargetHolders, rPropertyHolders, rViewInformation);
xSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
......
......@@ -63,12 +63,6 @@ Impl_Font::Impl_Font() :
mbVertical = false;
mbTransparent = true;
mbConfigLookup = false;
// #i124686# the Size is defaulted to (0,0) when default constructed,
// this is not useful for a default font. Init it to a useful default
// so that the Font::Font() constructor which uses a 'naked' static
// Impl_Font instance (aStaticImplFont) creates a useful default font
maSize = Size(0, 16);
}
Impl_Font::Impl_Font( const Impl_Font& rImplFont )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment