commit a258d42c77c3ce65a9455d08dc6106310222bc7b
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Wed Apr 07 17:42:36 2021 +0200
committer László Németh <nemeth@numbertext.org> Fri Apr 16 11:15:34 2021 +0200
tree d324a1baaa02e8836f86dcf1b84ca58a164303e0
parent e49917352ed2a53cd9025a65560bc3ea2808f4e5

tdf#141538 Make Remove button work in Select Address List dialog

... of the Mail Merge Wizard with non-GTK3 backends

This works around the different return value of
TreeView::get_selected_text()

Change-Id: Id7542f8e73731ffe5d133703f0bd0d0ebf26b89f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113747
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>

sw/source/ui/dbui/addresslistdialog.cxx

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index f30a39a..f57e5a2 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -52,6 +52,7 @@
#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;
@@ -304,8 +305,11 @@ 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(m_xListLB->get_selected_text());
    SwDBManager::RevokeDataSource(aSplitColumns.front());
    // Remove item from the list
    m_xListLB->remove(nEntry);
    // If this was the last item, disable the Remove & Edit buttons and enable Create