Bug#605588: unblock: openoffice.org/1:3.2.1-10
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package openoffice.org
As already talked about with Julien on IRC I'd to like to have #605120
(important upstream rendering bug in Impress) fixed in squeeze. Based on
approval - it's uploaded :)
unblock openoffice.org/1:3.2.1-10
Full diff:
diff -Nru openoffice.org-3.2.1/debian/changelog openoffice.org-3.2.1/debian/changelog
--- openoffice.org-3.2.1/debian/changelog 2010-11-14 23:40:19.000000000 +0100
+++ openoffice.org-3.2.1/debian/changelog 2010-11-30 13:40:16.000000000 +0100
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.1-10) unstable; urgency=medium
+
+ * debian/patches/slideshow-clipfix.diff: add patch from ooo-build-3-2-1
+ branch to fix clipping in slideshow (closes: #605120)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Nov 2010 21:27:31 +0000
+
openoffice.org (1:3.2.1-9) unstable; urgency=low
* debian/rules: actually install debian-presentation.odp to -common...
diff -Nru openoffice.org-3.2.1/debian/patches/series openoffice.org-3.2.1/debian/patches/series
--- openoffice.org-3.2.1/debian/patches/series 2010-11-15 00:03:16.000000000 +0100
+++ openoffice.org-3.2.1/debian/patches/series 2010-11-29 22:13:00.000000000 +0100
@@ -12,3 +12,4 @@
add-some-missing-german-translations.diff
pdf-link-export-fix.diff
set-correct-default-formula-syntax.diff
+slideshow-clipfix.diff
diff -Nru openoffice.org-3.2.1/debian/patches/slideshow-clipfix.diff openoffice.org-3.2.1/debian/patches/slideshow-clipfix.diff
--- openoffice.org-3.2.1/debian/patches/slideshow-clipfix.diff 1970-01-01 01:00:00.000000000 +0100
+++ openoffice.org-3.2.1/debian/patches/slideshow-clipfix.diff 2010-11-29 22:16:20.000000000 +0100
@@ -0,0 +1,48 @@
+--- /dev/null 2010-11-28 22:07:38.738975693 +0100
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/slideshow-clipfix.diff 2010-11-29 22:06:10.000000000 +0100
+@@ -0,0 +1,33 @@
++Fix for slideshow clipping bug i#112422
++
++From: Thorsten Behrens <tbehrens@novell.com>
++
++
++---
++
++ slideshow/source/engine/slide/layer.cxx | 4 ++++
++ 1 files changed, 4 insertions(+), 0 deletions(-)
++
++
++diff --git slideshow/source/engine/slide/layer.cxx slideshow/source/engine/slide/layer.cxx
++index f9d35b6..34a46b8 100644
++--- slideshow/source/engine/slide/layer.cxx
+++++ slideshow/source/engine/slide/layer.cxx
++@@ -39,6 +39,8 @@
++ #include <basegfx/range/b2dpolyrange.hxx>
++ #include <basegfx/matrix/b2dhommatrix.hxx>
++ #include <basegfx/polygon/b2dpolypolygon.hxx>
+++#include <basegfx/polygon/b2dpolypolygontools.hxx>
+++#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
++
++ #include "layer.hxx"
++
++@@ -291,6 +293,8 @@ namespace slideshow
++ // clipping, and render each shape that intersects with
++ // the calculated update area
++ ::basegfx::B2DPolyPolygon aClip( maUpdateAreas.solveCrossovers() );
+++ aClip = ::basegfx::tools::stripNeutralPolygons(aClip);
+++ aClip = ::basegfx::tools::stripDispensablePolygons(aClip, false);
++
++ // actually, if there happen to be shapes with zero
++ // update area in the maUpdateAreas vector, the
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 9095210..664e419 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
+@@ -4017,6 +4017,7 @@ sfx2-add-to-recently-used-after-save.diff, rodo
+ basegfx-boxclipper.diff, i#72418, thorsten
+ basegfx-clipstate.diff, i#72418, thorsten
+ slideshow-clipstate.diff, i#72418, thorsten
++slideshow-clipfix.diff, i#112422, thorsten
+
+ [ Fixes <= ooo320-m16 ]
+ svtools-wmf-clipperf-m16.diff, n#535304, thorsten
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Grüße/Regards,
Rene
Reply to: