include/vcl/salvtables.hxx | 17 +++++++++++++++++
vcl/jsdialog/jsdialogbuilder.cxx | 5 +++++
vcl/source/app/salvtables.cxx | 17 -----------------
3 files changed, 22 insertions(+), 17 deletions(-)
New commits:
commit a4b7f16cb2cf433eec58a06404b495ab9077d1fa
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Nov 12 14:28:47 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Dec 1 11:03:24 2020 +0100
jsdialog: signal when treeview element is toggled
Change-Id: If69eac02db386fd94420aff5a8b082281e913c15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106907
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx
index ee55bb9fa081..23db65df8525 100644
--- a/include/vcl/salvtables.hxx
+++ b/include/vcl/salvtables.hxx
@@ -1101,6 +1101,23 @@ public:
virtual ~SalInstanceTextView() override;
};
+struct SalInstanceTreeIter : public weld::TreeIter
+{
+ SalInstanceTreeIter(const SalInstanceTreeIter* pOrig)
+ : iter(pOrig ? pOrig->iter : nullptr)
+ {
+ }
+ SalInstanceTreeIter(SvTreeListEntry* pIter)
+ : iter(pIter)
+ {
+ }
+ virtual bool equal(const TreeIter& rOther) const override
+ {
+ return iter == static_cast<const SalInstanceTreeIter&>(rOther).iter;
+ }
+ SvTreeListEntry* iter;
+};
+
class SalInstanceTreeView : public SalInstanceContainer, public virtual
weld::TreeView
{
protected:
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 877ebaf6e8db..5ae77f856e2f 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -761,7 +761,12 @@ void JSTreeView::set_toggle(int pos, TriState eState, int
col)
pEntry = m_xTreeView->Next(pEntry);
if (pEntry)
+ {
SalInstanceTreeView::set_toggle(pEntry, eState, col);
+ signal_toggled(iter_col(SalInstanceTreeIter(pEntry), col));
+
+ notifyDialogState();
+ }
}
void JSTreeView::select(int pos)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 5b4a76a1c8ec..39f19171db0e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3199,23 +3199,6 @@ IMPL_LINK_NOARG(SalInstanceEntry, ActivateHdl, Edit&,
bool)
return m_aActivateHdl.Call(*this);
}
-struct SalInstanceTreeIter : public weld::TreeIter
-{
- SalInstanceTreeIter(const SalInstanceTreeIter* pOrig)
- : iter(pOrig ? pOrig->iter : nullptr)
- {
- }
- SalInstanceTreeIter(SvTreeListEntry* pIter)
- : iter(pIter)
- {
- }
- virtual bool equal(const TreeIter& rOther) const override
- {
- return iter == static_cast<const SalInstanceTreeIter&>(rOther).iter;
- }
- SvTreeListEntry* iter;
-};
-
static SalInstanceTreeView* g_DragSource;
// Each row has a cell for the expander image, (and an optional cell for a
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
