[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                  |    1 +
 patches/dev300/slideshow-clipfix.diff |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

New commits:
commit cac03601448eede008e92d10670943c2f425de43
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Jul 15 20:09:28 2010 +0200

    Fix slideshow clipping bug
    
    * patches/dev300/apply: added below patch
    * patches/dev300/slideshow-clipfix.diff: fix silly oversight for
      new rect clipper framework - the old implementation did a union,
      not an intersect. added corresponding normalization functions.
      Fixes upstream issue i#112422.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a95d736..4b05b93 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3960,6 +3960,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
diff --git a/patches/dev300/slideshow-clipfix.diff b/patches/dev300/slideshow-clipfix.diff
new file mode 100644
index 0000000..a34dd69
--- /dev/null
+++ b/patches/dev300/slideshow-clipfix.diff
@@ -0,0 +1,33 @@
+Fix for slideshow clipping bug i#112422
+
+From: Thorsten Behrens <tbehrens at 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