ooo-build r12756 - in branches/ooo-build-2-4-1: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jun  2 18:13:34 2008
New Revision: 12756
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12756&view=rev

Log:
2008-06-02  Petr Mladek  <pmladek suse cz>

	* patches/ooxml/sysui-desktop-ooxml.diff, patches/dev300/apply: add
	  the OOXML-related MIME types also to the upstream desktop files;
	  needed for the universal GO-OO build



Added:
   branches/ooo-build-2-4-1/patches/src680/sd-custom-show-fix.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Mon Jun  2 18:13:34 2008
@@ -2384,6 +2384,9 @@
 # Fix pasting with middle button in Calc
 sc-middle-button-should-paste-text.diff, n#282767, i#86734, jholesov
 
+# Make custom show override hidden slides
+sd-custom-show-fix.diff, n#355638, i#90145, thorsten
+
 
 [ Glib2 ]
 external-package-glib2.diff

Added: branches/ooo-build-2-4-1/patches/src680/sd-custom-show-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/sd-custom-show-fix.diff	Mon Jun  2 18:13:34 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 );
+ 			}
+ 		}
+ 	}