diff options
Diffstat (limited to 'sd')
-rwxr-xr-x | sd/source/ui/slideshow/slideshow.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index e52d99087e1a..4a2b5319d3a6 100755 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -731,12 +731,6 @@ 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()); @@ -751,6 +745,8 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) } } + xController->dispose(); + if( pFullScreenViewShellBase ) { PresentationViewShell* pShell = NULL; |