diff options
Diffstat (limited to 'sw/source/ui/chrdlg/drpcps.cxx')
| -rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 6ee99f411b8a..f6c75f66bd36 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -575,7 +575,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pPict->SetBorderStyle( WindowBorderStyle::MONO ); // Install handler - Link<> aLk = LINK(this, SwDropCapsPage, ModifyHdl); + Link<Edit&,void> aLk = LINK(this, SwDropCapsPage, ModifyHdl); m_pDropCapsField->SetModifyHdl( aLk ); m_pLinesField->SetModifyHdl( aLk ); m_pDistanceField->SetModifyHdl( aLk ); @@ -698,7 +698,7 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) if ( bChecked ) { - ModifyHdl(m_pDropCapsField); + ModifyHdl(*m_pDropCapsField); m_pDropCapsField->GrabFocus(); } else @@ -712,17 +712,17 @@ IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked()); - ModifyHdl(m_pDropCapsField); + ModifyHdl(*m_pDropCapsField); bModified = true; } -IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) +IMPL_LINK_TYPED( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) { OUString sPreview; // set text if applicable - if (pEdit == m_pDropCapsField) + if (&rEdit == m_pDropCapsField) { const sal_Int32 nVal = !m_pWholeWordCB->IsChecked() ? static_cast<sal_Int32>(m_pDropCapsField->GetValue()) @@ -748,7 +748,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) if (bSetText) m_pTextEdit->SetText(sPreview); } - else if (pEdit == m_pTextEdit) // set quantity if applicable + else if (&rEdit == m_pTextEdit) // set quantity if applicable { const sal_Int32 nTmp = m_pTextEdit->GetText().getLength(); m_pDropCapsField->SetValue(std::max<sal_Int32>(1, nTmp)); @@ -756,16 +756,14 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) } // adjust image - if (pEdit == m_pDropCapsField || pEdit == m_pTextEdit) + if (&rEdit == m_pDropCapsField || &rEdit == m_pTextEdit) m_pPict->SetText (sPreview); - else if (pEdit == m_pLinesField) + else if (&rEdit == m_pLinesField) m_pPict->SetLines((sal_uInt8)m_pLinesField->GetValue()); else m_pPict->SetDistance((sal_uInt16)m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP))); bModified = true; - - return 0; } IMPL_LINK_NOARG_TYPED(SwDropCapsPage, SelectHdl, ListBox&, void) |