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

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri May 30 09:30:21 2008
New Revision: 12721
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12721&view=rev

Log:
	* patches/dev300/sd-custom-show-fix.diff: make custom slide show
	override hidden state of slides (similar to a competing program)



Added:
   trunk/patches/dev300/sd-custom-show-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May 30 09:30:21 2008
@@ -2227,6 +2227,7 @@
 sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
 sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
 svx-hatched-textmove.diff, n#384563, i#89661, thorsten
+sd-custom-show-fix.diff, n#355638, i#90145, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env

Added: trunk/patches/dev300/sd-custom-show-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sd-custom-show-fix.diff	Fri May 30 09:30:21 2008
@@ -0,0 +1,13 @@
+--- sd/source/ui/slideshow/slideshowimpl.cxx	7 Dec 2007 11:59:34 -0000	1.50
++++ sd/source/ui/slideshow/slideshowimpl.cxx	30 May 2008 09:20:47 -0000
+@@ -2451,9 +2455,7 @@ void SlideshowImpl::createSlideList( boo
+ 			for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ )
+ 			{
+ 				const USHORT nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
+-
+-				if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded())
+-					mpSlideController->insertSlideNumber( nSdSlide );
++                mpSlideController->insertSlideNumber( nSdSlide );
+ 			}
+ 		}
+ 	}