[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 98d3ef152b7655e1aab2023304d4644380d5850c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 15 09:45:19 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 15 13:19:53 2020 +0200

    tdf#131333 SalMenus propogate to parent their selected id conditionally
    
    Menu::Select depends on its handler returning false to allow propogating a
    submens's selected id to its parent menu to become its selected id.
    
    without this, while gen menus already have propogated this to its parent in
    MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS won't
    propogate the selected id
    
    Change-Id: I1d87cb0deacdf5fbfb837acc21c2d23b79525aae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94268
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Jenkins

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9bfeb9997041..042008200709 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -930,7 +930,15 @@ public:
 IMPL_LINK_NOARG(SalInstanceMenu, SelectMenuHdl, ::Menu*, bool)
 {
     signal_activate(m_xMenu->GetCurItemIdent());
-    return true;
+    /* tdf#131333 Menu::Select depends on a false here to allow
+       propogating a submens's selected id to its parent menu to become its
+       selected id.
+
+       without this, while gen menus already have propogated this to its parent
+       in MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS
+       won't propogate the selected id
+    */
+    return false;
 }
 
 class SalInstanceToolbar : public SalInstanceWidget, public virtual weld::Toolbar