[PATCH libreoffice-4-0] Resolves: rhbz#906137 slide show inverts outputs

[Caolán McNamara (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2743

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2743/1

Resolves: rhbz#906137 slide show inverts outputs

we go to some effort to determine the right value of ret
and then throw it away and return 0

regression since 4a7e3482912c90b73d6e12c82bcd9ce31975e3f1

Change-Id: I652cfbe44fdab6560c1c8dc8fe25d6211b5357cb
(cherry picked from commit 67aae198f80195e77bd62e7675a372312075b126)
---
M vcl/unx/gtk/app/gtksys.cxx
1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index b7996c1..f5862c2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -179,14 +179,14 @@
 static int _fallback_get_primary_monitor (GdkScreen *pScreen)
 {
     // Use monitor name as primacy heuristic
-    int ret = -1;
     int max = gdk_screen_get_n_monitors (pScreen);
-    for (int i = 0; i < max && ret < 0; i++)
+    for (int i = 0; i < max; ++i)
     {
         char *name = gdk_screen_get_monitor_plug_name (pScreen, i);
-        if (name && !g_ascii_strncasecmp (name, "LVDS", 4))
-            ret = i;
+        bool bLaptop = (name && !g_ascii_strncasecmp (name, "LVDS", 4));
         g_free (name);
+        if (bLaptop)
+            return i;
     }
     return 0;
 }

-- 
To view, visit https://gerrit.libreoffice.org/2743
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I652cfbe44fdab6560c1c8dc8fe25d6211b5357cb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara <caolanm at redhat.com>