[ooo-build-commit] .: sd/source

[Caolán McNamara]

 sd/source/ui/slideshow/slideshow.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4e23c2101fcecd5ae3b1113e800beb14ca8ae982
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 15:11:19 2010 +0100

    #i94007# #i111758# fix RenderBadPicture on multihead setups and cairo

diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 4b66e8d..b0f34e7 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -698,6 +698,13 @@ 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
+        // pWorkWindow->i94007 & implement the solution outlined
+        // there.
+        xController->dispose();
+
         if( pFullScreenViewShellBase )
         {
             PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get());
@@ -712,8 +719,6 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
             }
         }
 
-        xController->dispose();
-
         if( pFullScreenViewShellBase )
         {
             PresentationViewShell* pShell = NULL;