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

[Caolán McNamara]

 vcl/source/window/layout.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1d7cf3f0391214a17593eced752e2a1786c0a1e3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 12 15:24:36 2017 +0000

    Resolves: tdf#104897 sort windows buttons into yes, no, cancel
    
    and kde, for gnome/macosx use no, cancel, yes
    
    Change-Id: I4aff39938c1c9f81b47934d8f1d9400c106781ad

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index cd18eb3..ca082e0 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -828,18 +828,22 @@ struct ButtonOrder
 
 static int getButtonPriority(const OString &rType)
 {
-    static const size_t N_TYPES = 3;
+    static const size_t N_TYPES = 5;
     static const ButtonOrder aDiscardCancelSave[N_TYPES] =
     {
         { "/discard", 0 },
+        { "/no", 0 },
         { "/cancel", 1 },
-        { "/save", 2 }
+        { "/save", 2 },
+        { "/yes", 2 }
     };
 
     static const ButtonOrder aSaveDiscardCancel[N_TYPES] =
     {
         { "/save", 0 },
+        { "/yes", 0 },
         { "/discard", 1 },
+        { "/no", 1 },
         { "/cancel", 2 }
     };