[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 30 17:20:59 UTC 2020
vcl/unx/gtk3/gtk3gtkinst.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 618a553b5e446f51aa93f715ba80372a9a246cc9
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 4 11:18:28 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Nov 30 18:20:20 2020 +0100
drop unneccessary argument and use known TextColumnId directly
Change-Id: I0c0331e3cf2aa76bca3aabacf06dcf5aebcb55a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95520
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106875
Tested-by: Szymon Kłos <szymon.klos at collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e76c6b071a6b..fa7efb08e4b9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -9900,9 +9900,9 @@ public:
return gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(m_pTreeView));
}
- int starts_with(const OUString& rStr, int col, int nStartRow, bool bCaseSensitive)
+ int starts_with(const OUString& rStr, int nStartRow, bool bCaseSensitive)
{
- return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, get_model_col(col), nStartRow, bCaseSensitive);
+ return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, m_nTextCol, nStartRow, bCaseSensitive);
}
virtual void disable_notify_events() override
@@ -12378,32 +12378,32 @@ private:
nStart = 0;
// Try match case insensitive from current position
- int nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
+ int nPos = m_pTreeView->starts_with(aStartText, nStart, true);
if (nPos == -1 && nStart != 0)
{
// Try match case insensitive, but from start
- nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+ nPos = m_pTreeView->starts_with(aStartText, 0, true);
}
if (!m_bAutoCompleteCaseSensitive)
{
// Try match case insensitive from current position
- nPos = m_pTreeView->starts_with(aStartText, 0, nStart, false);
+ nPos = m_pTreeView->starts_with(aStartText, nStart, false);
if (nPos == -1 && nStart != 0)
{
// Try match case insensitive, but from start
- nPos = m_pTreeView->starts_with(aStartText, 0, 0, false);
+ nPos = m_pTreeView->starts_with(aStartText, 0, false);
}
}
if (nPos == -1)
{
// Try match case sensitive from current position
- nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
+ nPos = m_pTreeView->starts_with(aStartText, nStart, true);
if (nPos == -1 && nStart != 0)
{
// Try match case sensitive, but from start
- nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+ nPos = m_pTreeView->starts_with(aStartText, 0, true);
}
}
More information about the Libreoffice-commits
mailing list