commit 4cbf5a4f666ac4d7b01746bc36ab01400e28ff40
author Caolán McNamara <caolanm@redhat.com> Fri Jun 21 21:55:20 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Sat Jun 22 19:28:04 2019 +0200
tree 10820be8bde947a816b6339782e9eee2bb0bd971
parent 8e0b55bc9b788d2ac95768af6b9e88996dc10d29

Related: tdf#126036 sort button by native order for async dialogs too

Change-Id: Iddc689b8d332e8e0127806c37b5ccce66eadfcf6
Reviewed-on: https://gerrit.libreoffice.org/74540
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index b17e021..fc62bb6 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1218,6 +1218,9 @@ public:
        VclAbstractDialog::AsyncContext aCtx;
        aCtx.mxOwnerDialogController = aOwner;
        aCtx.maEndDialogFn = rEndDialogFn;
        VclButtonBox* pActionArea = m_xDialog->get_action_area();
        if (pActionArea)
           pActionArea->sort_native_button_order();
        return m_xDialog->StartExecuteAsync(aCtx);
    }

@@ -1229,6 +1232,9 @@ public:
        // which is that rxSelf enforces.
        aCtx.mxOwnerSelf = rxSelf;
        aCtx.maEndDialogFn = rEndDialogFn;
        VclButtonBox* pActionArea = m_xDialog->get_action_area();
        if (pActionArea)
           pActionArea->sort_native_button_order();
        return m_xDialog->StartExecuteAsync(aCtx);
    }