[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Michael Meeks]

 vcl/unx/gtk/window/gtkframe.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit c75e170fb1e05c1a9998b6390a13d65f1e4577db
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Dec 16 15:56:23 2011 +0000

    teach old-style method about the new form of screen numbering fdo#43458
    
    We number now with a flat set of indicees across Xinerama
    and more standard multi-screen setups.

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index a384375..06d29d5 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -4162,12 +4162,8 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
 
 Size GtkSalDisplay::GetScreenSize( int nScreen )
 {
-    GdkScreen *pScreen = gdk_display_get_screen (m_pGdkDisplay, nScreen);
-    if (!pScreen)
-        return Size();
-    else
-        return Size( gdk_screen_get_width (pScreen),
-                     gdk_screen_get_height (pScreen) );
+    Rectangle aRect = m_pSys->GetDisplayScreenPosSizePixel( nScreen );
+    return Size( aRect.GetWidth(), aRect.GetHeight() );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */