incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1360602 - /incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx
Date Thu, 12 Jul 2012 09:40:17 GMT
Author: af
Date: Thu Jul 12 09:40:16 2012
New Revision: 1360602

URL: http://svn.apache.org/viewvc?rev=1360602&view=rev
Log:
#i94007# Dispose controller earlier when slide show is ended to avoid 
crash.

Modified:
    incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.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=1360602&r1=1360601&r2=1360602&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshow.cxx Thu Jul 12 09:40:16 2012
@@ -731,6 +731,13 @@ void SAL_CALL SlideShow::end() throw(Run
 		ViewShellBase* pFullScreenViewShellBase = mpFullScreenViewShellBase;
 		mpFullScreenViewShellBase = 0;
 
+        // Dispose the controller before calling StartPresentation()
+        // on the work window to prevent a crash that is triggered
+        // only by the cairo canvas: the work window is shutting down
+        // presentation mode.  Find details in issue When later asked for information the
+        // gtk system functions report an error and we crash.
+		xController->dispose();
+
 		if( pFullScreenViewShellBase )
 		{
 			PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get());
@@ -745,8 +752,6 @@ void SAL_CALL SlideShow::end() throw(Run
 			}
 		}
 
-		xController->dispose();
-
 		if( pFullScreenViewShellBase )
 		{
 			PresentationViewShell* pShell = NULL;



Mime
View raw message