[Libreoffice-commits] core.git: vcl/source vcl/unx

[Caolán McNamara]

 vcl/source/window/layout.cxx |    8 ++++----
 vcl/unx/gtk3/gtk3gtkinst.cxx |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ef4e7c2eb5b63abc30221e75d9b9c4437aa8e00b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 26 12:05:58 2018 +0100

    gtk3: improve cancel, no, yes order
    
    keep order "discard, cancel, save" but don't end up with "no, cancel, "yes",
    instead have "cancel", "no", yes"
    
    Change-Id: I7c3681b28a462e65942f5174ef386ecc2e6ee903
    Reviewed-on: https://gerrit.libreoffice.org/51871
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 3a01fa7611f6..2032cd433a98 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -833,11 +833,11 @@ static int getButtonPriority(const OString &rType)
     static const ButtonOrder aDiscardCancelSave[N_TYPES] =
     {
         { "/discard", 0 },
-        { "/no", 0 },
         { "/cancel", 1 },
-        { "/save", 2 },
-        { "/yes", 2 },
-        { "/ok", 2 }
+        { "/no", 2 },
+        { "/save", 3 },
+        { "/yes", 3 },
+        { "/ok", 3 }
     };
 
     static const ButtonOrder aSaveDiscardCancel[N_TYPES] =
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c5ba7be58909..7ab817b0cdd6 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1490,11 +1490,11 @@ namespace
         static const ButtonOrder aDiscardCancelSave[N_TYPES] =
         {
             { "/discard", 0 },
-            { "/no", 0 },
             { "/cancel", 1 },
-            { "/save", 2 },
-            { "/yes", 2 },
-            { "/ok", 2 }
+            { "/no", 2 },
+            { "/save", 3 },
+            { "/yes", 3 },
+            { "/ok", 3 }
         };
 
         static const ButtonOrder aSaveDiscardCancel[N_TYPES] =