ooo-build r14710 - in branches/ooo-build-3-0-1: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Dec  3 09:45:21 2008
New Revision: 14710
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14710&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/slideshow-blink-text-fix.diff: fixes non-blinking
    blink text during slideshow. Merge from trunk.



Added:
   branches/ooo-build-3-0-1/patches/dev300/slideshow-blink-text-fix.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Dec  3 09:45:21 2008
@@ -2557,6 +2557,7 @@
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
+slideshow-blink-text-fix.diff, i#96047, thorsten
 svx-ppt-textstyle-fix.diff, n#443127, thorsten
 
 [ ExtensionFixes ]

Added: branches/ooo-build-3-0-1/patches/dev300/slideshow-blink-text-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/slideshow-blink-text-fix.diff	Wed Dec  3 09:45:21 2008
@@ -0,0 +1,14 @@
+--- slideshow/source/engine/slide/layermanager.cxx~	2008-06-24 14:12:44.000000000 +0200
++++ slideshow/source/engine/slide/layermanager.cxx	2008-11-09 14:38:17.000000000 +0100
+@@ -494,8 +494,9 @@
+         {
+             if( !mbActive || mrViews.empty() )
+                 return;
+-
+-            if( rShape->isVisible() )
++            
++            // hidden sprite-shape needs render() call still, to hide sprite
++            if( rShape->isVisible() || rShape->isBackgroundDetached() )
+                 maUpdateShapes.insert( rShape );
+             else
+                 addUpdateArea( rShape );