diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:35:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:35:14 +0000 |
| commit | 32de5e480e4374e399e2d4e25afafdfd85754f33 (patch) | |
| tree | 33a3ec9813795f9b7a674682484d9078c5803d33 /sd/source/ui/slideshow/slideshowimpl.hxx | |
| parent | e40dc5a06746b16ecb940e20acbce4b2b369aedd (diff) | |
INTEGRATION: CWS impress23 (1.2.8); FILE MERGED
2005/01/11 14:48:11 dbo 1.2.8.3: #i39098# making slideshow creation/startShow()/startPreview() more robust
2004/12/22 13:34:49 dbo 1.2.8.2: RESYNC: (1.2-1.3); FILE MERGED
2004/12/15 15:09:55 bm 1.2.8.1: #i36799# react on switching the pen on and off via the navigator
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.hxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 31784771699f..5f2d6873f8a3 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: slideshowimpl.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: kz $ $Date: 2004-12-09 16:11:19 $ + * last change: $Author: kz $ $Date: 2005-01-21 16:35:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,8 +262,8 @@ public: SlideshowImpl( ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc ); ~SlideshowImpl(); - void startShow( PresentationSettings* pPresSettings ); - void startPreview( + bool startShow( PresentationSettings* pPresSettings ); + bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, ::Window* pParent = 0 ); @@ -317,6 +317,7 @@ public: void gotoLastSlide(); void endPresentation(); void gotoSlideIndex( sal_Int32 nPageIndex ); + void enablePen(); bool pause( bool bPause ); @@ -327,7 +328,7 @@ public: void onFirstPaint(); private: - void startShowImpl( + bool startShowImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > >& aSlides, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& aRootNodes, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ); |