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

[Szymon KÅ‚os (via logerrit)]

 include/vcl/jsdialog/jsdialogbuilder.hxx |    1 +
 vcl/jsdialog/jsdialogbuilder.cxx         |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit ad513aadc9f2330fbe52ce23ce87dc7db14c5307
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 5 14:42:44 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon May 18 16:31:50 2020 +0200

    jsdialog: send JSON on selection change
    
    Change-Id: I34bbd037c83e319b5689d2230d629e72e110bf74
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94301
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx b/include/vcl/jsdialog/jsdialogbuilder.hxx
index b375daf4f2b1..8befb2b0f79b 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -128,6 +128,7 @@ public:
                         const OUString* pIconName, VirtualDevice* pImageSurface) override;
     virtual void remove(int pos) override;
     virtual void set_entry_text(const OUString& rText) override;
+    virtual void set_active(int pos) override;
 };
 
 class VCL_DLLPUBLIC JSNotebook : public JSWidget<SalInstanceNotebook, ::TabControl>
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 1d572534e46c..080d5089eeb2 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -286,6 +286,12 @@ void JSComboBox::set_entry_text(const OUString& rText)
     notifyDialogState();
 }
 
+void JSComboBox::set_active(int pos)
+{
+    SalInstanceComboBoxWithEdit::set_active(pos);
+    notifyDialogState();
+}
+
 JSNotebook::JSNotebook(VclPtr<vcl::Window> aOwnedToplevel, ::TabControl* pControl,
                        SalInstanceBuilder* pBuilder, bool bTakeOwnership)
     : JSWidget<SalInstanceNotebook, ::TabControl>(aOwnedToplevel, pControl, pBuilder,