[Libreoffice-commits] core.git: sw/source

[Noel Grandin]

 sw/source/ui/dbui/mmaddressblockpage.cxx |   11 +++++------
 sw/source/ui/dbui/mmaddressblockpage.hxx |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit c830135c96a6ab2281a0adbd0e9563e1dc95cbf1
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Sep 18 09:07:06 2015 +0200

    convert Link<> to typed
    
    Change-Id: I3b80cc0147c8f21e391267fd1683af65934fd220
    Reviewed-on: https://gerrit.libreoffice.org/18696
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 4b4d6b7..199617a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -801,9 +801,9 @@ class SwAssignFieldsControl : public Control
     ::std::vector<VclPtr<ListBox> >     m_aMatches;
     ::std::vector<VclPtr<FixedText> >   m_aPreviews;
 
-    SwMailMergeConfigItem*      m_rConfigItem;
+    SwMailMergeConfigItem*              m_rConfigItem;
 
-    Link<>                      m_aModifyHdl;
+    Link<LinkParamNone*,void>   m_aModifyHdl;
 
     long                        m_nLBStartTopPos;
     long                        m_nYOffset;
@@ -823,10 +823,10 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     void        Init(SwMailMergeConfigItem& rConfigItem);
-    void        SetModifyHdl(const Link<>& rModifyHdl)
+    void        SetModifyHdl(const Link<LinkParamNone*,void>& rModifyHdl)
                 {
                     m_aModifyHdl = rModifyHdl;
-                    m_aModifyHdl.Call(this);
+                    m_aModifyHdl.Call(nullptr);
                 }
     virtual void Resize() SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -1234,13 +1234,12 @@ IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void)
     EndDialog(RET_OK);
 }
 
-IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, LinkParamNone*, void)
 {
     uno::Sequence< OUString > aAssignments = CreateAssignments();
     const OUString sPreview = SwAddressPreview::FillData(
             m_rPreviewString, m_rConfigItem, &aAssignments);
     m_pPreviewWIN->SetAddress(sPreview);
-    return 0;
 }
 
 DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 8e9fe5d..bbcab6e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -258,7 +258,7 @@ class SwAssignFieldsDialog : public SfxModalDialog
 
     ::com::sun::star::uno::Sequence< OUString > CreateAssignments();
     DECL_LINK_TYPED(OkHdl_Impl, Button*, void);
-    DECL_LINK(AssignmentModifyHdl_Impl, void*);
+    DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void);
 
 public:
     SwAssignFieldsDialog(vcl::Window* pParent,