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

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |    9 +++++++++
 vcl/jsdialog/jsdialogbuilder.cxx     |   23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)

New commits:
commit 8bd601208081635890e54a000064010198c6dd2e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Dec 16 10:18:15 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Dec 16 11:36:54 2020 +0100

    jsdialog: update JSON on treeview modification
    
    Change-Id: Ibaf186768f9be0cb2dc893082590c851abae29b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107819
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index fc0ffa6608eb..a440b7c0da97 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -385,6 +385,15 @@ public:
 
     virtual weld::TreeView* get_drag_source() const override;
 
+    using SalInstanceTreeView::insert;
+    virtual void insert(const weld::TreeIter* pParent, int pos, const OUString* pStr,
+                        const OUString* pId, const OUString* pIconName,
+                        VirtualDevice* pImageSurface, const OUString* pExpanderName,
+                        bool bChildrenOnDemand, weld::TreeIter* pRet) override;
+
+    virtual void set_text(int row, const OUString& rText, int col = -1) override;
+    virtual void set_text(const weld::TreeIter& rIter, const OUString& rStr, int col = -1) override;
+
     void drag_start();
     void drag_end();
 };
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index a8538dd4a5f8..6873683a8cda 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -960,6 +960,29 @@ void JSTreeView::drag_end()
     g_DragSource = nullptr;
 }
 
+void JSTreeView::insert(const weld::TreeIter* pParent, int pos, const OUString* pStr,
+                        const OUString* pId, const OUString* pIconName,
+                        VirtualDevice* pImageSurface, const OUString* pExpanderName,
+                        bool bChildrenOnDemand, weld::TreeIter* pRet)
+{
+    SalInstanceTreeView::insert(pParent, pos, pStr, pId, pIconName, pImageSurface, pExpanderName,
+                                bChildrenOnDemand, pRet);
+
+    notifyDialogState();
+}
+
+void JSTreeView::set_text(int row, const OUString& rText, int col)
+{
+    SalInstanceTreeView::set_text(row, rText, col);
+    notifyDialogState();
+}
+
+void JSTreeView::set_text(const weld::TreeIter& rIter, const OUString& rStr, int col)
+{
+    SalInstanceTreeView::set_text(rIter, rStr, col);
+    notifyDialogState();
+}
+
 JSExpander::JSExpander(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow,
                        ::VclExpander* pExpander, SalInstanceBuilder* pBuilder, bool bTakeOwnership,
                        std::string sTypeOfJSON)