ooo-build r12982 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Jun 27 08:52:50 2008
New Revision: 12982
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12982&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/slideshow-animated-bmp-fix.diff: grabbed patch
	from upstream issue that missed 3.0.



Added:
   trunk/patches/dev300/slideshow-animated-bmp-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jun 27 08:52:50 2008
@@ -2257,6 +2257,7 @@
 vcl-linking-randr.diff, i#89718, n#398244, thorsten
 vcl-png-import-fix.diff, n#397128, i#90913, thorsten
 sd-macro-nudges.diff, n#188199, thorsten
+slideshow-animated-bmp-fix.diff, i#73914, jlcheng
 
 [ LocalizeFixes ]
 # it is Y axis, not X one [in Spanish]

Added: trunk/patches/dev300/slideshow-animated-bmp-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/slideshow-animated-bmp-fix.diff	Fri Jun 27 08:52:50 2008
@@ -0,0 +1,31 @@
+--- slideshow/source/engine/shapes/gdimtftools.cxx	2006-12-15 03:46:58.000000000 +0800
++++ slideshow/source/engine/shapes/gdimtftools.cxx	2007-03-15 15:54:32.687500000 +0800
+@@ -438,11 +438,24 @@
+ 
+             case DISPOSE_BACK:
+             {
++				// #i70772# react on no mask
++				const Bitmap aMask(rAnimBmp.aBmpEx.GetMask());
++				const Bitmap aContent(rAnimBmp.aBmpEx.GetBitmap());
++
+                 aVDevMask.Erase();
+-                aVDev.DrawBitmap(rAnimBmp.aPosPix, 
+-                                 rAnimBmp.aBmpEx.GetBitmap());
+-                aVDevMask.DrawBitmap(rAnimBmp.aPosPix, 
+-                                     rAnimBmp.aBmpEx.GetMask());
++				aVDev.DrawBitmap(rAnimBmp.aPosPix, aContent);
++
++				if(aMask.IsEmpty())
++				{
++					const Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel());
++					aVDevMask.SetFillColor(COL_BLACK);
++					aVDevMask.SetLineColor();
++					aVDevMask.DrawRect(aRect);
++				}
++				else
++				{
++					aVDevMask.DrawBitmap(rAnimBmp.aPosPix, aMask);
++				}
+                 break;
+             }
+