[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

[Gabor Kelemen (via logerrit)]

 sw/source/ui/dbui/addresslistdialog.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 99ca6b660fd911e9e60b63ae286c588aedfb01d0
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Wed Apr 7 17:42:36 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Apr 20 21:40:31 2021 +0200

    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 at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit a258d42c77c3ce65a9455d08dc6106310222bc7b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114181
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 11c95bc0b478..da49d4ce9576 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -51,6 +51,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;
@@ -303,8 +304,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