dbaccess/source/ui/misc/WNameMatch.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 6b6484d25b63fe68e94f60ca8d6fb2b0b039bdfb
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 20 17:25:34 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 20 21:14:48 2020 +0100
Resolves: tdf#130075 have to specify which column is the text column
in this two column case
Change-Id: Ia999a0540b2d0f7c03a54241c61bf4c2231b8460
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87090
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx
b/dbaccess/source/ui/misc/WNameMatch.cxx
index 8e759d879178..fbc0675b4ef0 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -59,6 +59,10 @@ OWizNameMatching::OWizNameMatching(weld::Container* pPage,
OCopyTableWizard* pWi
m_xAll->connect_clicked(LINK(this,OWizNameMatching,AllNoneClickHdl));
m_xNone->connect_clicked(LINK(this,OWizNameMatching,AllNoneClickHdl));
+ std::vector<int> aWidths;
+ aWidths.push_back(m_xCTRL_LEFT->get_checkbox_column_width());
+ m_xCTRL_LEFT->set_column_fixed_widths(aWidths);
+
m_xCTRL_LEFT->connect_changed(LINK(this,OWizNameMatching,TableListClickHdl));
m_xCTRL_RIGHT->connect_changed(LINK(this,OWizNameMatching,TableListRightSelectHdl));
@@ -309,6 +313,8 @@ void OWizNameMatching::FillListBox(weld::TreeView&
rTreeView, const ODatabaseExp
int nRow(0);
+ const int nTextCol = bCheckButtons ? 1 : 0;
+
for (auto const& elem : rList)
{
rTreeView.append();
@@ -317,7 +323,7 @@ void OWizNameMatching::FillListBox(weld::TreeView&
rTreeView, const ODatabaseExp
bool bChecked = !elem->second->IsAutoIncrement();
rTreeView.set_toggle(nRow, bChecked ? TRISTATE_TRUE :
TRISTATE_FALSE, 0);
}
- rTreeView.set_text(nRow, elem->first);
+ rTreeView.set_text(nRow, elem->first, nTextCol);
rTreeView.set_id(nRow,
OUString::number(reinterpret_cast<sal_Int64>(elem->second)));
++nRow;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
