From 2a755f3af94d8bb0184d1045ac46f0f1f5bcf46d Mon Sep 17 00:00:00 2001 From: Andre Fische Date: Wed, 9 Mar 2011 11:16:39 +0100 Subject: impress211: #i110990# Fixed slide show spanning multiple displays on Windows. Conflicts: vcl/source/window/window.cxx --- vcl/source/window/window.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 4b5e4cd6b854..0ad17deaff65 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -9464,11 +9464,12 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr if( (nDisplay >= Application::GetScreenCount()) ) { xCanvas.set( xCanvasFactory->createInstanceWithArguments( - bSpriteCanvas ? - OUString( "com.sun.star.rendering.SpriteCanvas.MultiScreen" ) : - OUString( "com.sun.star.rendering.Canvas" ), - aArg ), - UNO_QUERY ); + bSpriteCanvas ? + OUString( "com.sun.star.rendering.SpriteCanvas.MultiScreen" ) : + OUString( "com.sun.star.rendering.Canvas.MultiScreen" ), + aArg ), + UNO_QUERY ); + } else { @@ -9483,7 +9484,6 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr #ifdef WNT } #endif - mpWindowImpl->mxCanvas = xCanvas; } -- cgit