summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-05 20:37:03 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2022-08-19 16:39:51 +0200
commit8eed692f8509aa8bdedc69d7d4ac328e220c3b42 (patch)
tree309fb69a41e90e7cbe272bbb44971c8de425f2f6 /vcl
parente65f6943ac066b9dfb9d0f537435570c5dbd5376 (diff)
adjust internal/external index for signal_toggled
g-lo-CellIndex is the internal view, adjust that for signal_toggled Conflicts: vcl/unx/gtk3/gtk3gtkinst.cxx Change-Id: I9ad0cf2e63c2bb03463650a84a9145cf3760ae4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95621 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit db9a737c6bec181a259d6bdba2a70b8342b7bdd6)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e1b65a2e460c..e3e62f8875ad 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8237,7 +8237,7 @@ private:
set(iter, m_aToggleTriStateMap[nCol], false);
- signal_toggled(std::make_pair(nRow, nCol));
+ signal_toggled(std::make_pair(nRow, to_external_model(nCol)));
gtk_tree_path_free(tree_path);
}
@@ -8354,6 +8354,8 @@ private:
void set_column_editable(int nCol, bool bEditable)
{
+ nCol = to_internal_model(nCol);
+
for (GList* pEntry = g_list_first(m_pColumns); pEntry; pEntry = g_list_next(pEntry))
{
GtkTreeViewColumn* pColumn = GTK_TREE_VIEW_COLUMN(pEntry->data);
@@ -8515,8 +8517,7 @@ public:
else if (m_nImageCol == -1)
m_nImageCol = nIndex;
}
- int nExternalIndex = to_external_model(nIndex);
- g_object_set_data(G_OBJECT(pCellRenderer), "g-lo-CellIndex", reinterpret_cast<gpointer>(nExternalIndex));
+ g_object_set_data(G_OBJECT(pCellRenderer), "g-lo-CellIndex", reinterpret_cast<gpointer>(nIndex));
++nIndex;
}
g_list_free(pRenderers);