commit 51e6a95757906dff8b2819a4141bf3dc7938e95f
author Caolán McNamara <caolanm@redhat.com> Fri Nov 23 17:14:25 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Sat Nov 24 15:42:17 2018 +0100
tree 187342c153d301242b3bfd6cba14fec46b1ee110
parent 7798c84c969b09f519be7f382fa55e15b4ddcb0b

allow collapsing rows

Change-Id: I6b137e4fbb860a1d40acc961dae413bcdb27575a
Reviewed-on: https://gerrit.libreoffice.org/63894
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

basctl/source/basicide/bastype2.cxx

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index b143924..ee2caf7 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -1574,7 +1574,10 @@ IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, weld::TreeView&, void)
            break;

        default:
            m_xControl->expand_row(*m_xIter);
            if (!m_xControl->get_row_expanded(*m_xIter))
                m_xControl->expand_row(*m_xIter);
            else
                m_xControl->collapse_row(*m_xIter);
            break;
    }
}

cui/source/customize/cfgutil.cxx

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index d0900c2..4204d2c 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1279,7 +1279,10 @@ IMPL_LINK_NOARG(CuiConfigGroupListBox, OpenCurrentHdl, weld::TreeView&, void)
    bool bValidIter = m_xTreeView->get_cursor(xIter.get());
    if (!bValidIter)
        return;
    m_xTreeView->expand_row(*xIter);
    if (!m_xTreeView->get_row_expanded(*xIter))
        m_xTreeView->expand_row(*xIter);
    else
        m_xTreeView->collapse_row(*xIter);
}

CuiConfigGroupListBox::~CuiConfigGroupListBox()

include/vcl/weld.hxx

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 1b9726a..ae7ed75 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -488,6 +488,7 @@ public:
    virtual void unselect(const TreeIter& rIter) = 0;
    virtual bool get_row_expanded(const TreeIter& rIter) const = 0;
    virtual void expand_row(TreeIter& rIter) = 0;
    virtual void collapse_row(TreeIter& rIter) = 0;
    virtual OUString get_text(const TreeIter& rIter) const = 0;
    virtual OUString get_id(const TreeIter& rIter) const = 0;
    virtual void scroll_to_row(const TreeIter& rIter) = 0;

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 259622b..c260359 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2153,6 +2153,13 @@ public:
            m_xTreeView->Expand(rVclIter.iter);
    }

    virtual void collapse_row(weld::TreeIter& rIter) override
    {
        SalInstanceTreeIter& rVclIter = static_cast<SalInstanceTreeIter&>(rIter);
        if (m_xTreeView->IsExpanded(rVclIter.iter))
            m_xTreeView->Collapse(rVclIter.iter);
    }

    virtual OUString get_text(const weld::TreeIter& rIter) const override
    {
        const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter);

vcl/unx/gtk3/gtk3gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 1fefb9d..b2800cf 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4641,6 +4641,16 @@ public:
        gtk_tree_path_free(path);
    }

    virtual void collapse_row(weld::TreeIter& rIter) override
    {
        GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter);
        GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
        GtkTreePath* path = gtk_tree_model_get_path(pModel, &rGtkIter.iter);
        if (gtk_tree_view_row_expanded(m_pTreeView, path))
            gtk_tree_view_collapse_row(m_pTreeView, path);
        gtk_tree_path_free(path);
    }

    virtual OUString get_text(const weld::TreeIter& rIter) const override
    {
        const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter);