diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-13 15:51:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-15 10:32:29 +0200 |
| commit | 74dbe58f1e5b6f4f281e13f348c8952b1086877a (patch) | |
| tree | fda8bd8374592491d3e64b02e4f3ca13879cf2d4 /sw/source/ui/dbui | |
| parent | fa21f301ddef575baad9a3aa8564199285e6d90b (diff) | |
convert Link<> to typed
Change-Id: I2ef1e5fe5c6dc65c254b3a16b0b12fca5caba16e
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 78c6bd70912b..16dfdd50b3b4 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -134,7 +134,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_pZoomLB->SelectEntryPos(0); //page size m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl)); - Link<> aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl); + Link<SpinField&,void> aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl); Link<Control&,void> aFocusHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl); m_pLeftMF->SetUpHdl(aFrameHdl); m_pLeftMF->SetDownHdl(aFrameHdl); @@ -684,9 +684,9 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressLoseFocusHdl_Impl, Control&, void) { - ChangeAddressHdl_Impl(nullptr); + ChangeAddressHdl_Impl(*m_pLeftMF); } -IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) { if(m_pExampleWrtShell && m_pAddressBlockFormat) { @@ -704,7 +704,6 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl) aSet.Put(SwFormatVertOrient( nTop, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME )); m_pExampleWrtShell->GetDoc()->SetFlyFrmAttr( *m_pAddressBlockFormat, aSet ); } - return 0; } IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) @@ -725,7 +724,7 @@ IMPL_LINK_TYPED(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pLeftFT->Enable(!bCheck); m_pLeftMF->Enable(!bCheck); - ChangeAddressHdl_Impl( 0 ); + ChangeAddressHdl_Impl( *m_pLeftMF ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 821f9666734e..83007a94623a 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -67,7 +67,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage DECL_LINK_TYPED(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); DECL_LINK_TYPED(ZoomHdl_Impl, ListBox&, void); - DECL_LINK(ChangeAddressHdl_Impl, void *); + DECL_LINK_TYPED(ChangeAddressHdl_Impl, SpinField&, void); DECL_LINK_TYPED(ChangeAddressLoseFocusHdl_Impl, Control&, void); DECL_LINK_TYPED(GreetingsHdl_Impl, Button*, void); DECL_LINK_TYPED(AlignToTextHdl_Impl, Button*, void); |