[openoffice.org] next milestone

[Caolan McNamara]

commit 912b4b613853d857f0b44a1a1efa366340a23cb8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 7 15:58:15 2010 +0100

    next milestone

 .gitignore                 |    2 +-
 openoffice.org.spec        |    8 +++-----
 sources                    |    2 +-
 workspace.cmcfixes77.patch |   14 ++++++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc4df1e..81a0cf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-OOO330_m2.tar.bz2
+OOO330_m3.tar.bz2
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 56e27d1..ad7cbd3 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
-%define ooomilestone 2
-%define rh_rpm_release 4
+%define ooomilestone 3
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -112,7 +112,6 @@ 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}
@@ -1639,7 +1638,6 @@ 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`
@@ -3781,7 +3779,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Fri Aug 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.4
+* Sat Aug 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.1
 - Resolves: rhbz#621248 32bit events in forms on 64bit
 - Resolves: rhbz#618047 Brackets incorrectly render in presentations
   (dtardon)
diff --git a/sources b/sources
index fa50cc6..c3accba 100644
--- a/sources
+++ b/sources
@@ -14,4 +14,4 @@ b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 011e6e849144d5ca35299f015073652b  redhat-registry.tar.gz
-a028fa864c151f0d1755e4fe9c489319  OOO330_m2.tar.bz2
+15af8c5913850a90a14bc15876559655  OOO330_m3.tar.bz2
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index b1ba433..f9527dc 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -1393,3 +1393,17 @@ diff -r a4c016dc07ba forms/source/component/Button.hxx
      sal_Int16   m_nTargetUrlFeatureId;
      /// caches the value of the "Enabled" property of our model
      sal_Bool    m_bEnabledByPropertyValue;
+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);