summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-01 11:50:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-01 15:20:29 +0200
commit3f738d8f9e5c448ddf352a8e10e6c619dde7d87d (patch)
tree87f0a2317365dab2f1c653424f37de986f9873ac /vcl
parenta98afdd321439cfe376299eef42d9fd5c449355a (diff)
weld SvxPathTabPage
Change-Id: If9b982d9e73adbb55e940ae12e5d894dd803f7f3 Reviewed-on: https://gerrit.libreoffice.org/76788 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/salvtables.cxx6
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx29
2 files changed, 26 insertions, 9 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7ad3a1fd521c..6db8e912378f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3271,6 +3271,12 @@ public:
set_sensitive(pEntry, bSensitive, col);
}
+ virtual void set_sensitive(const weld::TreeIter& rIter, bool bSensitive, int col) override
+ {
+ const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter);
+ set_sensitive(rVclIter.iter, bSensitive, col);
+ }
+
virtual TriState get_toggle(int pos, int col) const override
{
SvTreeListEntry* pEntry = m_xTreeView->GetEntry(nullptr, pos);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f4695e08ded3..f06f818930ad 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -6870,6 +6870,19 @@ private:
g_DragSource = nullptr;
}
+ int get_sensitive_model_col(int col)
+ {
+ if (col == -1)
+ col = m_nTextCol;
+ else
+ col = get_model_col(col);
+ col += m_nIdCol + 1; // skip over id column
+ col += m_aToggleVisMap.size(); // skip over toggle columns
+ col += m_aToggleTriStateMap.size(); // skip over tristate columns
+ col += m_aWeightMap.size(); // skip over weight columns
+ return col;
+ }
+
public:
GtkInstanceTreeView(GtkTreeView* pTreeView, GtkInstanceBuilder* pBuilder, bool bTakeOwnership)
: GtkInstanceContainer(GTK_CONTAINER(pTreeView), pBuilder, bTakeOwnership)
@@ -7480,15 +7493,13 @@ public:
virtual void set_sensitive(int pos, bool bSensitive, int col) override
{
- if (col == -1)
- col = m_nTextCol;
- else
- col = get_model_col(col);
- col += m_nIdCol + 1; // skip over id column
- col += m_aToggleVisMap.size(); // skip over toggle columns
- col += m_aToggleTriStateMap.size(); // skip over tristate columns
- col += m_aWeightMap.size(); // skip over weight columns
- set(pos, col, bSensitive);
+ set(pos, get_sensitive_model_col(col), bSensitive);
+ }
+
+ virtual void set_sensitive(const weld::TreeIter& rIter, bool bSensitive, int col) override
+ {
+ const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter);
+ set(rGtkIter.iter, get_sensitive_model_col(col), bSensitive);
}
void set_image(const GtkTreeIter& iter, int col, GdkPixbuf* pixbuf)