[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 vcl/jsdialog/executor.cxx |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit f14e38653fc2298471e4fa3326c47b84a9bc7520
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jan 13 09:13:29 2021 +0100
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Jan 21 19:18:45 2021 +0100

    jsdialog: TreeView row activation
    
    Change-Id: I3d2884d456f8b6fa01d2dbe6c4d2f7d9e9528e1e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109261
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 72f1cbe59a90921ef74bfda5ffb7f4db6578a1af)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109736
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 63a8f9dd011f..834962561acb 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -235,7 +235,19 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat
                     pTreeView->select(nRow);
                     pTreeView->set_cursor(nRow);
                     LOKTrigger::trigger_changed(*pTreeView);
-                    //LOKTrigger::trigger_row_activated(*pTreeView);
+                    return true;
+                }
+                else if (sAction == "activate")
+                {
+                    OString nRowString
+                        = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US);
+                    int nRow = std::atoi(nRowString.getStr());
+
+                    pTreeView->unselect(pTreeView->get_selected_index());
+                    pTreeView->select(nRow);
+                    pTreeView->set_cursor(nRow);
+                    LOKTrigger::trigger_changed(*pTreeView);
+                    LOKTrigger::trigger_row_activated(*pTreeView);
                     return true;
                 }
                 else if (sAction == "expand")