[openoffice.org/f14/master] Resolves: rhbz#557317/ooo#113910 get rid of ugly frame in cairo-canvas

[Caolan McNamara]

commit 59976527db404d725ca400b6d6b55d8d2c1daa92
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 16 14:18:17 2010 +0100

    Resolves: rhbz#557317/ooo#113910 get rid of ugly frame in cairo-canvas

 openoffice.org.spec        |    7 ++++++-
 workspace.cmcfixes78.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 4448ded..73e3221 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 4
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -116,6 +116,7 @@ Patch37: openoffice.org-gccXXXXX.idlc.patch
 Patch38: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
 Patch39: workspace.impress197.patch
 Patch40: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
+Patch41: workspace.cmcfixes78.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1644,6 +1645,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch38 -p0 -b .ooo106591.sal.tradcopy.patch
 %patch39 -p1 -b .workspace.impress197.patch
 %patch40 -p1 -b .ooo113856.vcl.mutter.patch
+%patch41 -p1 -b .workspace.cmcfixes78.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3819,6 +3821,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Mon Aug 16 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-.3
+- Resolves: rhbz#557317/ooo#113910 get rid of ugly frame in cairo-canvas
+
 * Fri Aug 13 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-4.2
 - Resolves: rhbz#623800 gnome-shell/mutter focus problems
 
diff --git a/workspace.cmcfixes78.patch b/workspace.cmcfixes78.patch
new file mode 100644
index 0000000..bd3822b
--- /dev/null
+++ b/workspace.cmcfixes78.patch
@@ -0,0 +1,11 @@
+diff -r 87f4911ea629 canvas/source/cairo/cairo_canvashelper.cxx
+--- a/canvas/source/cairo/cairo_canvashelper.cxx	Mon Aug 02 18:43:47 2010 +0200
++++ b/canvas/source/cairo/cairo_canvashelper.cxx	Mon Aug 16 14:06:14 2010 +0100
+@@ -1395,6 +1395,7 @@
+ 				::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
+ 				::rtl::math::approxEqual( aMatrix.y0, 0 ) )
+  				cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
++			cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
+ 			cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
+ 			cairo_clip( mpCairo.get() );
+