[openoffice.org/f13/master] Resolves rhbz#618047 Brackets incorrectly render in presentations

[David Tardon]

commit 98f95549b41ccf86f0c1492bb26562c351946b66
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Aug 6 13:42:55 2010 +0200

    Resolves rhbz#618047 Brackets incorrectly render in presentations

 ...ce.org-3.2.0.ooo113400.canvas.fix-scaling.patch |   18 ++++++++++++++++++
 openoffice.org.spec                                |    6 +++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.2.0.ooo113400.canvas.fix-scaling.patch b/openoffice.org-3.2.0.ooo113400.canvas.fix-scaling.patch
new file mode 100644
index 0000000..7031340
--- /dev/null
+++ b/openoffice.org-3.2.0.ooo113400.canvas.fix-scaling.patch
@@ -0,0 +1,18 @@
+# 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);
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 81dcef5..49e0115 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -168,6 +168,7 @@ Patch97: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-withou
 Patch98: openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch
 Patch99: workspace.findbar01.patch
 Patch100: workspace.cmcfixes77.patch
+Patch101: openoffice.org-3.2.0.ooo113400.canvas.fix-scaling.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1766,6 +1767,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch98 -p0 -b .ooo113117.extensions.broken.scanner.shutdown.patch
 %patch99 -p1 -b .workspace.findbar01.patch
 %patch100 -p1 -b .workspace.cmcfixes77.patch
+%patch101 -p1 -b .ooo113400.canvas.fix-scaling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4251,8 +4253,10 @@ fi
 %endif
 
 %changelog
-* Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.28-UNRELEASED
+* Fri Aug 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.28-UNRELEASED
 - Resolves: rhbz#621248 32bit events in forms on 64bit
+- Resolves rhbz#618047 Brackets incorrectly render in presentations
+  (dtardon)
 
 * Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.27
 - Resolves: rhbz#608114 cppu-lifecycle issues (caolanm)