summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-10-30 10:51:08 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2020-12-01 11:02:22 +0100
commitc191da8d670262db1631f98ad3c9885f8f05dc10 (patch)
tree566a517e6d173fb234b4bf4ef93f054116ecaf40 /include
parent754032d6c7c2037fee05e28cf581e06ad2ab9d5a (diff)
jsdialog: implement TreeView
Change-Id: I7c1cc683e8c5d5bdc00c1e3d3d0a2c85846bbda0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106903 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/jsdialog/executor.hxx6
-rw-r--r--include/vcl/salvtables.hxx2
-rw-r--r--include/vcl/weld.hxx2
3 files changed, 9 insertions, 1 deletions
diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx
index 1cfa24c28a8a..e49190f31e5f 100644
--- a/include/vcl/jsdialog/executor.hxx
+++ b/include/vcl/jsdialog/executor.hxx
@@ -22,6 +22,11 @@ public:
static void trigger_changed(weld::ComboBox& rComboBox) { rComboBox.signal_changed(); }
+ static void trigger_row_activated(weld::TreeView& rTreeView)
+ {
+ rTreeView.signal_row_activated();
+ }
+
static void trigger_clicked(weld::Toolbar& rToolbar, const OString& rIdent)
{
rToolbar.signal_clicked(rIdent);
@@ -36,6 +41,7 @@ public:
namespace jsdialog
{
VCL_DLLPUBLIC bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rData);
+VCL_DLLPUBLIC StringMap jsonToStringMap(const char* pJSON);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx
index 7e98f133251b..ee55bb9fa081 100644
--- a/include/vcl/salvtables.hxx
+++ b/include/vcl/salvtables.hxx
@@ -1103,7 +1103,7 @@ public:
class SalInstanceTreeView : public SalInstanceContainer, public virtual weld::TreeView
{
-private:
+protected:
// owner for UserData
std::vector<std::unique_ptr<OUString>> m_aUserData;
VclPtr<SvTabListBox> m_xTreeView;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 248bbfcd80ed..289c68aa148e 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -685,6 +685,8 @@ public:
*/
class VCL_DLLPUBLIC TreeView : virtual public Container
{
+ friend class ::LOKTrigger;
+
public:
typedef std::pair<const TreeIter&, int> iter_col;
typedef std::pair<const TreeIter&, OUString> iter_string;