desktop/source/lib/init.cxx | 14 ++++++++++++++
include/vcl/weld.hxx | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 61c6d9a15c61d500958c53bc0ab8e83a8b2f1021
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Jul 1 14:49:03 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Jul 6 12:36:51 2020 +0200
jsdialog: execute entry set text
Change-Id: I9e7d7da0bc0b6494b59270c683ae4a18d927bf4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97624
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97861
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 767204cf05ee..f499213cf0a2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3735,6 +3735,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 88dbcf0dad5f..f2c6713dc77c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1470,11 +1470,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
