summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow/slideshow.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-25 19:27:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-04-25 20:43:33 +0100
commitb7197cfe5d207b171412760c6d72353f31947e93 (patch)
treec70bd16b68ccf8bc187acdc591526bff759bc3b8 /sd/source/ui/slideshow/slideshow.cxx
parente56ff47c65c6924e2c58d365c83c4db50eb87bb2 (diff)
Related: rhbz#1032774 slide restarter should disable auto-exit
The scenario is a pps that exits the app when the presentation is complete. But using "switch screens" in the presenter console will stop and restart the presentation. So protect that "stop" against existing by disabling the autoexit and restoring it afterwards Change-Id: Id986ad7e3cfafb8068540fb90d05443f329b554c
Diffstat (limited to 'sd/source/ui/slideshow/slideshow.cxx')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx20
1 files changed, 15 insertions, 5 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 594aaa2a7be9..279bd8b45445 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -147,16 +147,12 @@ SlideShow::SlideShow( SdDrawDocument* pDoc )
{
}
-
-
-void SlideShow::ThrowIfDisposed() throw (RuntimeException)
+void SlideShow::ThrowIfDisposed() const throw (RuntimeException)
{
if( mpDoc == 0 )
throw DisposedException();
}
-
-
/// used by the model to create a slideshow for it
rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc )
{
@@ -679,6 +675,20 @@ WorkWindow *SlideShow::GetWorkWindow()
return dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
}
+bool SlideShow::IsExitAfterPresenting() const
+{
+ SolarMutexGuard aGuard;
+ ThrowIfDisposed();
+ return mpDoc->IsExitAfterPresenting();
+}
+
+void SlideShow::SetExitAfterPresenting(bool bExit)
+{
+ SolarMutexGuard aGuard;
+ ThrowIfDisposed();
+ mpDoc->SetExitAfterPresenting(bExit);
+}
+
void SAL_CALL SlideShow::end()
throw (RuntimeException, std::exception)
{