diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-18 09:07:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-20 06:33:36 +0000 |
| commit | c830135c96a6ab2281a0adbd0e9563e1dc95cbf1 (patch) | |
| tree | 8aa593d10fba2ff55add2772731d6d03f0ecaaa9 /sw | |
| parent | 9b47e752419b03b96e17cb776eb4db374a6d09c1 (diff) | |
convert Link<> to typed
Change-Id: I3b80cc0147c8f21e391267fd1683af65934fd220
Reviewed-on: https://gerrit.libreoffice.org/18696
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 11 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 4b4d6b7564d6..199617a7512c 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 8e9fe5d58e31..bbcab6e56ab2 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, |