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

[rodo svn gnome org]

Author: rodo
Date: Mon Oct  6 15:57:03 2008
New Revision: 14217
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14217&view=rev

Log:
2008-10-06  Radek Doulik  <rodo novell com>

	* build/ooo300-m7/slideshow/source/engine/transitions/slidetransitionfactory.cxx:
	return from PluginSlideChange constructor on 1st failed transition
	addition, leaving mbSuccess set to false. also ENSURE_OR_THROW
	check to check for non NULL maTransitions.back()

	* patches/dev300/apply: added
	slideshow-plugin-transition-fix.diff, which should help with
	n#430449, changes described above



Added:
   branches/ooo-build-3-0/patches/dev300/slideshow-plugin-transition-fix.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Mon Oct  6 15:57:03 2008
@@ -2551,6 +2551,7 @@
 cairocanvas-colorspace-fix.diff, thorsten
 slideshow-colorspace-fix.diff, thorsten
 slideshow-cutblack.diff, thorsten
+slideshow-plugin-transition-fix.diff, n#430449, rodo
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Added: branches/ooo-build-3-0/patches/dev300/slideshow-plugin-transition-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/slideshow-plugin-transition-fix.diff	Mon Oct  6 15:57:03 2008
@@ -0,0 +1,16 @@
+diff -rup slideshow-orig/source/engine/transitions/slidetransitionfactory.cxx slideshow/source/engine/transitions/slidetransitionfactory.cxx
+--- slideshow-orig/source/engine/transitions/slidetransitionfactory.cxx	2008-10-06 16:44:49.000000000 +0200
++++ slideshow/source/engine/transitions/slidetransitionfactory.cxx	2008-10-06 16:45:23.000000000 +0200
+@@ -160,9 +160,10 @@ public:
+         const UnoViewVector::const_iterator aEnd(rViewContainer.end());
+         while( aCurrView != aEnd )
+         {
+-	    addTransition( *aCurrView );
++	    if(! addTransition( *aCurrView ) )
++		return;
+ 
+-            ENSURE_OR_THROW(maTransitions.back()->mxTransition.is(),
++            ENSURE_OR_THROW(maTransitions.back() && maTransitions.back()->mxTransition.is(),
+                             "Failed to create plugin transition");
+             ++aCurrView;
+         }