[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/slideshow-plugin-transition-fix.diff |   58 --------------------
 1 file changed, 58 deletions(-)

New commits:
commit dcc2d918f076a0923d1b7c360e8e45d4b3d534fd
Author: Radek Doulik <rodo at novell.com>
Date:   Thu May 13 11:16:19 2010 +0200

    removed patch which went upstream
    
    * patches/dev300/slideshow-plugin-transition-fix.diff:

diff --git a/patches/dev300/slideshow-plugin-transition-fix.diff b/patches/dev300/slideshow-plugin-transition-fix.diff
deleted file mode 100644
index 5cfcfdf..0000000
--- a/patches/dev300/slideshow-plugin-transition-fix.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-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;
-         }
---- slideshow/source/engine/slideshowimpl.cxx	2009-04-02 12:36:30.000000000 +0200
-+++ slideshow/source/engine/slideshowimpl.cxx	2009-03-25 18:01:38.000000000 +0100
-@@ -73,6 +73,7 @@
- #include <com/sun/star/presentation/XSlideShow.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <com/sun/star/lang/XServiceName.hpp>
-+#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
- 
- #include "unoviewcontainer.hxx"
- #include "transitionfactory.hxx"
-@@ -477,18 +480,24 @@
- {
-     // keep care not constructing any UNO references to this inside ctor,
-     // shift that code to create()!
--    
-+   
-     uno::Reference<lang::XMultiComponentFactory> xFactory( 
-         mxComponentContext->getServiceManager() );
- 
-     if( xFactory.is() )
-     {
--        // #i82460# try to retrieve special transition factory
--        mxOptionalTransitionFactory.set( 
--            xFactory->createInstanceWithContext( 
--                ::rtl::OUString::createFromAscii( "com.sun.star.presentation.TransitionFactory" ),
--                mxComponentContext ), 
--            uno::UNO_QUERY );
-+        try
-+	{
-+            // #i82460# try to retrieve special transition factory
-+            mxOptionalTransitionFactory.set( 
-+                xFactory->createInstanceWithContext( 
-+                    ::rtl::OUString::createFromAscii( "com.sun.star.presentation.TransitionFactory" ),
-+                    mxComponentContext ), 
-+                uno::UNO_QUERY );
-+        }
-+        catch (loader::CannotActivateFactoryException const&)
-+	{
-+	}
-     }
- 
-     mpListener.reset( new SeparateListenerImpl(