[ooo-build-commit] .: patches/dev300

[Caolán McNamara]

 patches/dev300/apply                        |    1 
 patches/dev300/timely-canvas-disposing.diff |   67 ----------------------------
 2 files changed, 68 deletions(-)

New commits:
commit 09908c78b32b3785be9cc6f174447b65e2d71829
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 15:07:26 2010 +0100

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

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1277dc1..8696a0d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2192,7 +2192,6 @@ svtools-update-ole.diff, n#411855, thorsten
 #sw-import-TOC.diff ,n#404254, Amelia Wang
 
 jurt-jnilib-deliver.diff, i#93516, thorsten
-timely-canvas-disposing.diff, i#94007, thorsten
 # only build full package for en_US, use langpacks for the rest
 instset-prefer-langpacks.diff, thorsten
 # call unopkg such that java does not require interactive session
diff --git a/patches/dev300/timely-canvas-disposing.diff b/patches/dev300/timely-canvas-disposing.diff
deleted file mode 100644
index b9993b1..0000000
--- a/patches/dev300/timely-canvas-disposing.diff
+++ /dev/null
@@ -1,67 +0,0 @@
----
- sd/source/ui/slideshow/slideshow.cxx |    9 +++++++--
- vcl/source/window/wrkwin.cxx         |   14 ++++++++++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git sd/source/ui/slideshow/slideshow.cxx sd/source/ui/slideshow/slideshow.cxx
-index 66ca3c7..d78e1b1 100755
---- sd/source/ui/slideshow/slideshow.cxx
-+++ sd/source/ui/slideshow/slideshow.cxx
-@@ -699,6 +699,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());
-@@ -713,8 +720,6 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
-             }
-         }
- 
--        xController->dispose();
--
-         if( pFullScreenViewShellBase )
-         {
-             PresentationViewShell* pShell = NULL;
-diff --git vcl/source/window/wrkwin.cxx vcl/source/window/wrkwin.cxx
-index 916dc8e..71cf334 100644
---- vcl/source/window/wrkwin.cxx
-+++ vcl/source/window/wrkwin.cxx
-@@ -43,6 +43,8 @@
- #include <vcl/window.h>
- #include <vcl/wrkwin.hxx>
- #include <vcl/sysdata.hxx>
-+#include <com/sun/star/lang/XComponent.hpp>
-+#include <com/sun/star/rendering/XCanvas.hpp>
- 
- // =======================================================================
- 
-@@ -192,6 +194,18 @@ void WorkWindow::ShowFullScreenMode( BOOL bFullScreenMode, sal_Int32 nDisplay )
-     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 = TRUE;
-         ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplay );
-     }
--- 
-1.7.0.1
-