You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by er...@apache.org on 2011/09/10 20:08:31 UTC
svn commit: r1167570 - in /incubator/ooo/trunk/main/vcl:
aqua/source/gdi/salgdi.cxx win/source/gdi/salgdi3.cxx
Author: erack
Date: Sat Sep 10 18:08:31 2011
New Revision: 1167570
URL: http://svn.apache.org/viewvc?rev=1167570&view=rev
Log:
ooo34gsl01: #i117131# use correct sign for TTFontInfo
# User Philipp Lohmann [pl] <Ph...@oracle.com>
Modified:
incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (contents, props changed)
incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx
Modified: incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1167570&r1=1167569&r2=1167570&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Sat Sep 10 18:08:31 2011
@@ -2229,8 +2229,8 @@ sal_Bool AquaSalGraphics::CreateFontSubs
rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
Point( aTTInfo.xMax, aTTInfo.yMax ) );
rInfo.m_nCapHeight = aTTInfo.yMax; // Well ...
- rInfo.m_nAscent = +aTTInfo.winAscent;
- rInfo.m_nDescent = -aTTInfo.winDescent;
+ rInfo.m_nAscent = aTTInfo.winAscent;
+ rInfo.m_nDescent = aTTInfo.winDescent;
// mac fonts usually do not have an OS2-table
// => get valid ascent/descent values from other tables
if( !rInfo.m_nAscent )
Propchange: incubator/ooo/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx?rev=1167570&r1=1167569&r2=1167570&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx Sat Sep 10 18:08:31 2011
@@ -2788,8 +2788,8 @@ sal_Bool WinSalGraphics::CreateFontSubse
::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo );
rInfo.m_nFontType = FontSubsetInfo::SFNT_TTF;
rInfo.m_aPSName = ImplSalGetUniString( aTTInfo.psname );
- rInfo.m_nAscent = +aTTInfo.winAscent;
- rInfo.m_nDescent = -aTTInfo.winDescent;
+ rInfo.m_nAscent = aTTInfo.winAscent;
+ rInfo.m_nDescent = aTTInfo.winDescent;
rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
Point( aTTInfo.xMax, aTTInfo.yMax ) );
rInfo.m_nCapHeight = aTTInfo.yMax; // Well ...