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

[Thorsten Behrens]

 patches/dev300/apply                        |    1 +
 patches/dev300/vcl-drawtransparent-fix.diff |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit cf9a0d355765f6d128f312b1901ac71e5c1bf3a3
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Jan 29 00:34:14 2010 +0100

    Fix BadMatch crash during slideshow
    
    * patches/dev300/apply: added below patch
    * patches/dev300/vcl-drawtransparent-fix.diff: defensive fix of a
      BadMatch, occurring during attempt of creating render picture for
      1bpp pixmap. i#107763

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 77a7d19..b5f9a76 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3510,6 +3510,7 @@ evaluation-row-limit.diff
 [ Fixes ]
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
+vcl-drawtransparent-fix.diff, i#107763, thorsten
 
 [ BuildBits == ooo320-m11 ]
 connectivity-build-fix.diff, i#107957, fridrich
diff --git a/patches/dev300/vcl-drawtransparent-fix.diff b/patches/dev300/vcl-drawtransparent-fix.diff
new file mode 100644
index 0000000..0ee1355
--- /dev/null
+++ b/patches/dev300/vcl-drawtransparent-fix.diff
@@ -0,0 +1,14 @@
+#i107763# don't crash with BadMatch on 1bpp Pixmaps
+
+diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
+index cf20a29..db34542 100644
+--- vcl/source/gdi/outdev6.cxx
++++ vcl/source/gdi/outdev6.cxx
+@@ -269,6 +269,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
+     // try hard to draw it directly, because the emulation layers are slower
+     if( !pDisableNative
+         && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) 
++        && GetBitCount() > 8
+ #ifdef WIN32
+         // workaround bad dithering on remote displaying when using GDI+ with toolbar buttoin hilighting
+         && !rPolyPoly.IsRect()