diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 13:21:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 13:21:10 +0000 |
| commit | 57060ba91a91f6c4fe0afef90fa366a17034a9a1 (patch) | |
| tree | 0842c05134bfbc075518f1ec0d02aae59261ef12 /slideshow/source/engine/slideshowimpl.cxx | |
| parent | 12bdbeaa6b54156bcba037adac1633022526aa27 (diff) | |
CWS-TOOLING: integrate CWS transogl03redux
2009-02-09 13:59:40 +0100 thb r267511 : #i96946# Added seemingly missing change for the color space selection for the slide textures
2009-02-04 10:47:12 +0100 cmc r267353 : #i96946# integrate ogltrans work
Diffstat (limited to 'slideshow/source/engine/slideshowimpl.cxx')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 18c834e4dfb0..d89d57d2d7f8 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -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" @@ -100,6 +101,7 @@ #include <vector> #include <iterator> #include <algorithm> +#include <stdio.h> using namespace com::sun::star; using namespace ::slideshow::internal; @@ -483,12 +485,18 @@ SlideShowImpl::SlideShowImpl( 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( |