------------------------------------------------------------ revno: 2094 committer: Rene Engelhard <[email protected]> branch nick: debian timestamp: Mon 2010-11-29 22:36:32 +0100 message: * debian/patches/slideshow-clipfix.diff: add patch from ooo-build-3-2-1 branch to fix clipping in slideshow (closes: #605120) added: patches/slideshow-clipfix.diff modified: changelog patches/series
=== modified file 'changelog' --- a/changelog 2010-11-15 14:33:47 +0000 +++ b/changelog 2010-11-29 21:36:32 +0000 @@ -1,3 +1,10 @@ +openoffice.org (1:3.2.1-10) UNRELEASED; 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 <[email protected]> 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...
=== modified file 'patches/series' --- a/patches/series 2010-11-03 21:44:53 +0000 +++ b/patches/series 2010-11-29 21:36:32 +0000 @@ -12,3 +12,4 @@ add-some-missing-german-translations.diff pdf-link-export-fix.diff set-correct-default-formula-syntax.diff +slideshow-clipfix.diff === added file 'patches/slideshow-clipfix.diff' --- a/patches/slideshow-clipfix.diff 1970-01-01 00:00:00 +0000 +++ b/patches/slideshow-clipfix.diff 2010-11-29 21:36:32 +0000 @@ -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 <[email protected]> ++ ++ ++--- ++ ++ 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
