incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1198909 - in /incubator/ooo/trunk/main: sd/source/ui/slideshow/slideshow.cxx vcl/source/window/wrkwin.cxx
Date Mon, 07 Nov 2011 20:12:59 GMT
Author: pfg
Date: Mon Nov  7 20:12:59 2011
New Revision: 1198909

URL: http://svn.apache.org/viewvc?rev=1198909&view=rev
Log:
i94007 - Revert r1195527 at author's request.

Modified:
    incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx
    incubator/ooo/trunk/main/vcl/source/window/wrkwin.cxx

Modified: incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx?rev=1198909&r1=1198908&r2=1198909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx Mon Nov  7 20:12:59 2011
@@ -731,12 +731,6 @@ void SAL_CALL SlideShow::end() throw(Run
 		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(Run
 			}
 		}
 
+		xController->dispose();
+
 		if( pFullScreenViewShellBase )
 		{
 			PresentationViewShell* pShell = NULL;

Modified: incubator/ooo/trunk/main/vcl/source/window/wrkwin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/wrkwin.cxx?rev=1198909&r1=1198908&r2=1198909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/wrkwin.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/wrkwin.cxx Mon Nov  7 20:12:59 2011
@@ -32,9 +32,7 @@
 // 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>
 #include <brdwin.hxx>
@@ -188,18 +186,6 @@ void WorkWindow::ShowFullScreenMode( sal
     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 );
     }



Mime
View raw message