From 09e3d45cdc5c739e5246388a83ccfc6d76bf66e9 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 21 Oct 2019 14:20:12 +0100
Subject: weld fpicker cluster
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6566263809ff0032388a0b56571f0cf7428058d7
Reviewed-on: https://gerrit.libreoffice.org/81334
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 basctl/source/basicide/moduldl2.cxx | 4 ++--
 basctl/source/basicide/moduldlg.cxx | 4 ++--
 basctl/source/inc/bastype2.hxx      | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 2673658205b7..c2633699b66a 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -228,8 +228,8 @@ LibPage::LibPage(weld::Container* pParent, OrganizeDialog* pDialog)
 
     m_xBasicsBox->connect_changed( LINK( this, LibPage, BasicSelectHdl ) );
 
-    m_xLibBox->connect_editing_started( LINK( this, LibPage, EditingEntryHdl ) );
-    m_xLibBox->connect_editing_done( LINK( this, LibPage, EditedEntryHdl ) );
+    m_xLibBox->connect_editing(LINK(this, LibPage, EditingEntryHdl),
+                               LINK(this, LibPage, EditedEntryHdl));
 
     FillListBox();
     m_xBasicsBox->set_active(0);
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fb1d72e2d161..0812647911f0 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -557,8 +557,8 @@ ObjectPage::ObjectPage(weld::Container* pParent, const OString &rName, BrowseMod
 
     m_xDropTarget.reset(new SbTreeListBoxDropTarget(*m_xBasicBox));
 
-    m_xBasicBox->connect_editing_started( LINK( this, ObjectPage, EditingEntryHdl ) );
-    m_xBasicBox->connect_editing_done( LINK( this, ObjectPage, EditedEntryHdl ) );
+    m_xBasicBox->connect_editing(LINK(this, ObjectPage, EditingEntryHdl),
+                                 LINK(this, ObjectPage, EditedEntryHdl));
 
     m_xBasicBox->SetMode( nMode );
     m_xBasicBox->ScanAllEntries();
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 88c303e3f5d1..d6abc4414453 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -320,13 +320,10 @@ public:
     float get_approximate_digit_width() const { return m_xControl->get_approximate_digit_width(); }
     int get_height_rows(int nRows) const { return m_xControl->get_height_rows(nRows); }
     int get_iter_index_in_parent(const weld::TreeIter& rIter) const { return m_xControl->get_iter_index_in_parent(rIter); }
-    void connect_editing_started(const Link<const weld::TreeIter&, bool>& rLink)
+    void connect_editing(const Link<const weld::TreeIter&, bool>& rStartLink,
+                         const Link<const std::pair<const weld::TreeIter&, OUString>&, bool>& rEndLink)
     {
-        m_xControl->connect_editing_started(rLink);
-    }
-    void connect_editing_done(const Link<const std::pair<const weld::TreeIter&, OUString>&, bool>& rLink)
-    {
-        m_xControl->connect_editing_done(rLink);
+        m_xControl->connect_editing(rStartLink, rEndLink);
     }
 
     void make_sorted() { m_xControl->make_sorted(); };
-- 
cgit