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

[Michael Meeks]

 vcl/unx/gtk/app/gtksys.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ae56ccf13ce8ed1047df8eeae379670dcbeaa36
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 2 14:26:11 2012 +0200

    fdo#49365 correctly map monitor index back to screen
    
    Change-Id: I396b34119a2686011640d5f15de616fe2a166237
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 5251cda..42d61b2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -93,7 +93,7 @@ GtkSalSystem::getScreenMonitorFromIdx (GdkDisplay *pDisplay, int nIdx, gint &nMo
         pScreen = gdk_display_get_screen (pDisplay, i);
         if (!pScreen)
             break;
-        if (nIdx > gdk_screen_get_n_monitors (pScreen))
+        if (nIdx >= gdk_screen_get_n_monitors (pScreen))
             nIdx -= gdk_screen_get_n_monitors (pScreen);
         else
             break;
commit fb76a7ace7bbde0a410634535d5d96f3de9bca8a
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 26 06:36:22 2012 +0200

    incrementing index twice in one run seems wrong
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 6690d5f..5251cda 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -90,7 +90,7 @@ GtkSalSystem::getScreenMonitorFromIdx (GdkDisplay *pDisplay, int nIdx, gint &nMo
     GdkScreen *pScreen = NULL;
     for (gint i = 0; i < gdk_display_get_n_screens (pDisplay); i++)
     {
-        pScreen = gdk_display_get_screen (pDisplay, i++);
+        pScreen = gdk_display_get_screen (pDisplay, i);
         if (!pScreen)
             break;
         if (nIdx > gdk_screen_get_n_monitors (pScreen))