i94007 - Revert r1195527 at author's request.

2 files changed, 2 insertions, 20 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;
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 0d059f297b10..bf902d07cc13 100755
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -32,8 +32,6 @@
 // declare system types in sysdata.hxx
 #include <svsys.h>
 #include <vcl/sysdata.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
 
 #include <svdata.hxx>
 #include <salframe.hxx>
@@ -188,18 +186,6 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla
     mbFullScreenMode = bFullScreenMode != 0;
     if ( !mbSysChild )
     {
-        // Dispose of the canvas implementation, which might rely on
-        // screen-specific system data.
-        com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas );
-        if( xCanvas.is() )
-        {
-            com::sun::star::uno::Reference< com::sun::star::lang::XComponent >
-                xCanvasComponent( xCanvas,
-                                  com::sun::star::uno::UNO_QUERY );
-            if( xCanvasComponent.is() )
-                xCanvasComponent->dispose();
-        }
-
         mpWindowImpl->mpFrameWindow->mpWindowImpl->mbWaitSystemResize = sal_True;
         ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplay );
     }