diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:33:51 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:33:51 +0000 |
commit | e31f77d4baa330bedcc8da875c82d2274c8377af (patch) | |
tree | d9f3b3c12dadff64640604c2a7e65ac3fbc53e34 /sd/source/ui/dlg/docprev.cxx | |
parent | 4da2265191b78170a6de9cfb25944693d386def0 (diff) |
INTEGRATION: CWS impress23 (1.13.8); FILE MERGED
2005/01/11 14:48:09 dbo 1.13.8.1: #i39098# making slideshow creation/startShow()/startPreview() more robust
Diffstat (limited to 'sd/source/ui/dlg/docprev.cxx')
-rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index b713e733e57a..23082df4b54f 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docprev.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2004-11-26 20:02:12 $ + * last change: $Author: kz $ $Date: 2005-01-21 16:33:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,6 +118,9 @@ #endif #include "sdpage.hxx" +#include <memory> + + using ::com::sun::star::drawing::XDrawPage; using ::com::sun::star::animations::XAnimationNode; @@ -243,12 +246,14 @@ void SdDocPreviewWin::startPreview() if( pPage ) { - mpSlideShow = new sd::Slideshow( 0, 0, pDoc ); + std::auto_ptr<sd::Slideshow> pSlideShow( + new sd::Slideshow( 0, 0, pDoc ) ); Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY ); Reference< XAnimationNode > xAnimationNode; - mpSlideShow->startPreview( xDrawPage, xAnimationNode, this ); + if (pSlideShow->startPreview( xDrawPage, xAnimationNode, this )) + mpSlideShow = pSlideShow.release(); } } } |