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

[Szymon KÅ‚os (via logerrit)]

 desktop/source/lib/init.cxx |   14 ++++++++++++++
 include/vcl/weld.hxx        |    3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit db9744e527fad959418d3a21f3295acc863b20d9
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jul 1 14:49:03 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Jul 2 08:21:50 2020 +0200

    jsdialog: execute entry set test
    
    Change-Id: I9e7d7da0bc0b6494b59270c683ae4a18d927bf4f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97624
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 29439f85912c..93412fbc6473 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3758,6 +3758,20 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long
                             bContinueWithLOKWindow = true;
                     }
                 }
+                else if (sControlType == "edit")
+                {
+                    auto pEdit = dynamic_cast<weld::Entry*>(pWidget);
+                    if (pEdit)
+                    {
+                        if (sAction == "change")
+                        {
+                            pEdit->set_text(aMap["data"]);
+                            pEdit->signal_changed();
+                        }
+                        else
+                            bContinueWithLOKWindow = true;
+                    }
+                }
                 else
                 {
                     bContinueWithLOKWindow = true;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7905a286e24c..4dfbeb9317bc 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1265,11 +1265,12 @@ protected:
     Link<Entry&, void> m_aCursorPositionHdl;
     Link<Entry&, bool> m_aActivateHdl;
 
-    void signal_changed() { m_aChangeHdl.Call(*this); }
     void signal_cursor_position() { m_aCursorPositionHdl.Call(*this); }
     void signal_insert_text(OUString& rString);
 
 public:
+    void signal_changed() { m_aChangeHdl.Call(*this); }
+
     virtual void set_text(const OUString& rText) = 0;
     virtual OUString get_text() const = 0;
     virtual void set_width_chars(int nChars) = 0;