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

[David Tardon]

commit 9bfb6aa99ad99960e7d47debeee461719f3e6c63
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Aug 6 13:56:43 2010 +0200

    Resolves rhbz#618047 Brackets incorrectly render in presentations

 ...ce.org-3.2.0.ooo113400.canvas.fix-scaling.patch |   18 ++++++++++++++++++
 openoffice.org.spec                                |    8 ++++++--
 2 files changed, 24 insertions(+), 2 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 310e0c9..56e27d1 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -33,7 +33,7 @@
 Summary:        OpenOffice.org comprehensive office suite
 Name:           openoffice.org
 Version:        3.3.0
-Release:        %{ooomilestone}.%{rh_rpm_release}%{?dist}.1
+Release:        %{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:          1
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
@@ -112,6 +112,7 @@ Patch35: workspace.sb126.patch
 Patch36: workspace.vcl114.patch
 Patch37: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 Patch38: openoffice.org-gccXXXXX.idlc.patch
+Patch39: 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}
@@ -1638,6 +1639,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch36 -p0 -b .workspace.vcl114.patch
 %patch37 -p0 -b .ooo113273.desktop.resolvelinks.patch
 %patch38 -p1 -b .gccXXXXX.idlc.patch
+%patch39 -p1 -b .ooo113400.canvas.fix-scaling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3779,8 +3781,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.4
+* Fri Aug 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.4
 - Resolves: rhbz#621248 32bit events in forms on 64bit
+- Resolves: rhbz#618047 Brackets incorrectly render in presentations
+  (dtardon)
 
 * Tue Aug 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.3
 - remove openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch