cid#1545965 COPY_INSTEAD_OF_MOVE

and

cid#1545849 COPY_INSTEAD_OF_MOVE
cid#1545814 COPY_INSTEAD_OF_MOVE
cid#1545685 COPY_INSTEAD_OF_MOVE
cid#1545583 COPY_INSTEAD_OF_MOVE
cid#1545575 COPY_INSTEAD_OF_MOVE
cid#1545517 COPY_INSTEAD_OF_MOVE
cid#1545474 COPY_INSTEAD_OF_MOVE

Change-Id: I79a47ee34dace3a4664bfece26c59e719f469cab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

3 files changed, 8 insertions, 9 deletions

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 88025bde129c..cc7b34092d01 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1543,8 +1543,7 @@ protected:
     DECL_LINK(StartDragHdl, SvTreeListBox*, bool);
     DECL_STATIC_LINK(SalInstanceTreeView, FinishDragHdl, SvTreeListBox*, void);
     DECL_LINK(EditingEntryHdl, SvTreeListEntry*, bool);
-    typedef std::pair<SvTreeListEntry*, OUString> IterString;
-    DECL_LINK(EditedEntryHdl, IterString, bool);
+    DECL_LINK(EditedEntryHdl, const IterString&, bool);
     DECL_LINK(VisibleRangeChangedHdl, SvTreeListBox*, void);
     DECL_LINK(CompareHdl, const SvSortData&, sal_Int32);
     DECL_LINK(PopupMenuHdl, const CommandEvent&, bool);
diff --git a/vcl/inc/treeglue.hxx b/vcl/inc/treeglue.hxx
index d445a533b43f..6e3930a017df 100644
--- a/vcl/inc/treeglue.hxx
+++ b/vcl/inc/treeglue.hxx
@@ -19,7 +19,7 @@ class LclHeaderTabListBox final : public SvHeaderTabListBox
 {
 private:
     Link<SvTreeListEntry*, bool> m_aEditingEntryHdl;
-    Link<std::pair<SvTreeListEntry*, OUString>, bool> m_aEditedEntryHdl;
+    Link<const IterString&, bool> m_aEditedEntryHdl;
 
 public:
     LclHeaderTabListBox(vcl::Window* pParent, WinBits nWinStyle)
@@ -32,7 +32,7 @@ public:
         m_aEditingEntryHdl = rLink;
     }
 
-    void SetEditedEntryHdl(const Link<std::pair<SvTreeListEntry*, OUString>, bool>& rLink)
+    void SetEditedEntryHdl(const Link<const IterString&, bool>& rLink)
     {
         m_aEditedEntryHdl = rLink;
     }
@@ -46,7 +46,7 @@ public:
 
     virtual bool EditedEntry(SvTreeListEntry* pEntry, const OUString& rNewText) override
     {
-        return m_aEditedEntryHdl.Call(std::pair<SvTreeListEntry*, OUString>(pEntry, rNewText));
+        return m_aEditedEntryHdl.Call(IterString(pEntry, rNewText));
     }
 };
 
@@ -56,7 +56,7 @@ class LclTabListBox final : public SvTabListBox
     Link<SvTreeListBox*, bool> m_aStartDragHdl;
     Link<SvTreeListBox*, void> m_aEndDragHdl;
     Link<SvTreeListEntry*, bool> m_aEditingEntryHdl;
-    Link<std::pair<SvTreeListEntry*, OUString>, bool> m_aEditedEntryHdl;
+    Link<const IterString&, bool> m_aEditedEntryHdl;
 
 public:
     LclTabListBox(vcl::Window* pParent, WinBits nWinStyle)
@@ -71,7 +71,7 @@ public:
     {
         m_aEditingEntryHdl = rLink;
     }
-    void SetEditedEntryHdl(const Link<std::pair<SvTreeListEntry*, OUString>, bool>& rLink)
+    void SetEditedEntryHdl(const Link<const IterString&, bool>& rLink)
     {
         m_aEditedEntryHdl = rLink;
     }
@@ -164,7 +164,7 @@ public:
 
     virtual bool EditedEntry(SvTreeListEntry* pEntry, const OUString& rNewText) override
     {
-        return m_aEditedEntryHdl.Call(std::pair<SvTreeListEntry*, OUString>(pEntry, rNewText));
+        return m_aEditedEntryHdl.Call(IterString(pEntry, rNewText));
     }
 };
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f51ce48a505c..bf76517fea68 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5384,7 +5384,7 @@ IMPL_LINK(SalInstanceTreeView, EditingEntryHdl, SvTreeListEntry*, pEntry, bool)
     return signal_editing_started(SalInstanceTreeIter(pEntry));
 }
 
-IMPL_LINK(SalInstanceTreeView, EditedEntryHdl, IterString, rIterString, bool)
+IMPL_LINK(SalInstanceTreeView, EditedEntryHdl, const IterString&, rIterString, bool)
 {
     return signal_editing_done(
         iter_string(SalInstanceTreeIter(rIterString.first), rIterString.second));