diff options
Diffstat (limited to 'sd')
-rwxr-xr-x | sd/source/ui/slideshow/slideshow.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 7bee71e35014..9a8e5f9749a5 100755 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -735,6 +735,12 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) ViewShellBase* pFullScreenViewShellBase = mpFullScreenViewShellBase; mpFullScreenViewShellBase = 0; + // dispose before fullscreen window changes screens + // (potentially). If this needs to be moved behind + // pWorkWindow->StartPresentationMode() again, read issue + // i94007 & implement the solution outlined there. + xController->dispose(); + if( pFullScreenViewShellBase ) { PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get()); @@ -749,8 +755,6 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) } } - xController->dispose(); - if( pFullScreenViewShellBase ) { PresentationViewShell* pShell = NULL; |