Author: hdu
Date: Fri Apr 11 06:51:13 2014
New Revision: 1586584
URL: http://svn.apache.org/r1586584
Log:
#i124617# restore lost comment markers
Merged from trunk revision 1586583.
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/vcl/aqua/source/gdi/ctlayout.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1586583
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1586583
Modified: openoffice/branches/AOO410/main/vcl/aqua/source/gdi/ctlayout.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/aqua/source/gdi/ctlayout.cxx?rev=1586584&r1=1586583&r2=1586584&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/aqua/source/gdi/ctlayout.cxx (original)
+++ openoffice/branches/AOO410/main/vcl/aqua/source/gdi/ctlayout.cxx Fri Apr 11
06:51:13 2014
@@ -67,7 +67,7 @@ private:
float mfFontScale; // TODO: does CoreText have a font size limit?
CGFloat mfFontRotation; // text direction angle (in radians)
- CGFloat mfFontStretch; <1.0: font is squeezed, >1.0 font is stretched
+ CGFloat mfFontStretch; // <1.0: font gets squeezed, >1.0: font gets
stretched
// cached details about the resulting layout
// mutable members since these details are all lazy initialized
