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/frmdlg | |
| parent | fa21f301ddef575baad9a3aa8564199285e6d90b (diff) | |
convert Link<> to typed
Change-Id: I2ef1e5fe5c6dc65c254b3a16b0b12fca5caba16e
Diffstat (limited to 'sw/source/ui/frmdlg')
| -rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 2595b91ef741..73874e4ddfdb 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -672,7 +672,7 @@ VclPtr<SfxTabPage> SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet * bool SwColumnPage::FillItemSet(SfxItemSet *rSet) { if(m_pCLNrEdt->HasChildPathFocus()) - m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); + m_pCLNrEdt->GetDownHdl().Call(*m_pCLNrEdt); // set in ItemSet setzen // the current settings are already present diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index bc3227de5030..d30e3edc58a3 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -95,7 +95,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); - Link<> aLk = LINK(this, SwWrapTabPage, RangeModifyHdl); + Link<SpinField&,void> aLk = LINK(this, SwWrapTabPage, RangeModifyHdl); Link<Control&,void> aLk3 = LINK(this, SwWrapTabPage, RangeLoseFocusHdl); m_pLeftMarginED->SetUpHdl(aLk); m_pLeftMarginED->SetDownHdl(aLk); @@ -491,8 +491,8 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) m_pTopMarginED->SetMax(m_pTopMarginED->Normalize(nTop), FUNIT_TWIP); m_pBottomMarginED->SetMax(m_pBottomMarginED->Normalize(nBottom), FUNIT_TWIP); - RangeModifyHdl(m_pLeftMarginED); - RangeModifyHdl(m_pTopMarginED); + RangeModifyHdl(*m_pLeftMarginED); + RangeModifyHdl(*m_pTopMarginED); } const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(rSet.Get(RES_SURROUND)); @@ -589,19 +589,20 @@ SfxTabPage::sfxpg SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) // range check IMPL_LINK_TYPED( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void ) { - RangeModifyHdl( static_cast<MetricField*>(&rControl) ); + RangeModifyHdl( static_cast<SpinField&>(rControl) ); } -IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField*, pEdit ) +IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) { - sal_Int64 nValue = pEdit->GetValue(); + MetricField& rEdit = static_cast<MetricField&>(rSpin); + sal_Int64 nValue = rEdit.GetValue(); MetricField *pOpposite = 0; - if (pEdit == m_pLeftMarginED) + if (&rEdit == m_pLeftMarginED) pOpposite = m_pRightMarginED; - else if (pEdit == m_pRightMarginED) + else if (&rEdit == m_pRightMarginED) pOpposite = m_pLeftMarginED; - else if (pEdit == m_pTopMarginED) + else if (&rEdit == m_pTopMarginED) pOpposite = m_pBottomMarginED; - else if (pEdit == m_pBottomMarginED) + else if (&rEdit == m_pBottomMarginED) pOpposite = m_pTopMarginED; OSL_ASSERT(pOpposite); @@ -610,10 +611,9 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField*, pEdit ) { sal_Int64 nOpposite = pOpposite->GetValue(); - if (nValue + nOpposite > std::max(pEdit->GetMax(), pOpposite->GetMax())) + if (nValue + nOpposite > std::max(rEdit.GetMax(), pOpposite->GetMax())) pOpposite->SetValue(pOpposite->GetMax() - nValue); } - return 0; } IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) |