diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-21 20:27:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-22 11:00:12 +0200 |
| commit | 9be6795255f7348ca002b141310a2bd458e91b0e (patch) | |
| tree | 726ebfc4630954b5a44756dfc1c83dca524cded8 | |
| parent | 78df8f9dc1d28f5390aedb634b07817a22ce989c (diff) | |
tdf#141538 default to returning contents of first text column
which is what we're doing in the gtk version
Change-Id: Ia04ce3d62342c143b1e62dfd0ecf579ef0279b02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f57e5a2b01e4..f30a39a26080 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -52,7 +52,6 @@ #include <svl/urihelper.hxx> #include <strings.hrc> #include <view.hxx> -#include <comphelper/string.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -305,11 +304,8 @@ IMPL_LINK_NOARG(SwAddressListDialog, RemoveHdl_Impl, weld::Button&, void) if (xQuery->run() != RET_YES) return; - // tdf#141538: Split content of TreeView row to make removal work on non-GTK vclplugs - std::vector<OUString> aSplitColumns = comphelper::string::split(m_xListLB->get_selected_text(), '\t'); - // Remove data source connection - SwDBManager::RevokeDataSource(aSplitColumns.front()); + SwDBManager::RevokeDataSource(m_xListLB->get_selected_text()); // Remove item from the list m_xListLB->remove(nEntry); // If this was the last item, disable the Remove & Edit buttons and enable Create diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index bdb45fe9ad45..e381aeb2e64d 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -4358,7 +4358,7 @@ OUString SalInstanceTreeView::get_selected_text() const { assert(m_xTreeView->IsUpdateMode() && "don't request selection when frozen"); if (SvTreeListEntry* pEntry = m_xTreeView->FirstSelected()) - return m_xTreeView->GetEntryText(pEntry); + return SvTabListBox::GetEntryText(pEntry, 0); return OUString(); } |