commit 01cd1d68d96057624db38b9baaa6c6795353758d
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:18 2019 +0200
tree 5beabe9f1405317beb71bf76b2b73c3c9b869b18
parent 3d98a2b8135315c57af86490eac32963688e3be4

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

Change-Id: Iddc689b8d332e8e0127806c37b5ccce66eadfcf6
Reviewed-on: https://gerrit.libreoffice.org/74541
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 1330b12..f5f86da2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1202,6 +1202,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);
    }

@@ -1213,6 +1216,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);
    }