Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > cd8ce32c919af60229fca1d7f792c60e > files > 58

openoffice.org-3.2.0-12.35.fc13.src.rpm

# HG changeset patch
# Parent b96c661a8f965dc8bb290bc41b6caa98d94b3142
#i113400# fix font scaling in cairo canvas

diff -r b96c661a8f96 canvas/source/cairo/cairo_textlayout.cxx
--- a/canvas/source/cairo/cairo_textlayout.cxx	Fri Aug 06 11:55:33 2010 +0200
+++ b/canvas/source/cairo/cairo_textlayout.cxx	Fri Aug 06 13:30:27 2010 +0200
@@ -521,8 +521,8 @@
             nWidth = aFont.GetHeight();
         } else {
             // any scaling needs to be relative to the platform-dependent definition
-            // of width of the font
-            nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth();
+            // of height of the font
+            nWidth = aFont.GetWidth() * aFont.GetHeight() / aMetric.GetHeight();
         }
         
         cairo_matrix_init_identity(&m);