diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 13:53:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 16:19:37 +0000 |
| commit | e85b2333bce7b1dcae73861df6d90b48b9f4efe5 (patch) | |
| tree | 21d066cecfbfda9ace96b26953ddcc3ae1764001 /reportdesign | |
| parent | ff6462e6307e6924dc6c8178043ae9032f4b4152 (diff) | |
convert Link<> to typed
Change-Id: I59d325c3b051690303a5841907317122fa1ec98b
Reviewed-on: https://gerrit.libreoffice.org/18825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 14 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/GroupsSorting.hxx | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index d2f4281dc90d..68ce8f2f20c6 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1104,19 +1104,19 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) return nDataType; } -IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl ) +IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) { if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() ) { Control* pControls[] = { m_pFieldExpression->getExpressionControl(), m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pGroupIntervalEd, m_pKeepTogetherLst, m_pOrderLst}; for (size_t i = 0; i < sizeof(pControls)/sizeof(pControls[0]); ++i) { - if ( pControl == pControls[i] ) + if ( &rControl == pControls[i] ) { - ListBox* pListBox = dynamic_cast< ListBox* >( pControl ); + ListBox* pListBox = dynamic_cast< ListBox* >( &rControl ); if ( pListBox ) pListBox->SaveValue(); - NumericField* pNumericField = dynamic_cast< NumericField* >( pControl ); + NumericField* pNumericField = dynamic_cast< NumericField* >( &rControl ); if ( pNumericField ) pNumericField->SaveValue(); showHelpText(static_cast<sal_uInt16>(i+STR_RPT_HELP_FIELD)); @@ -1124,17 +1124,15 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl ) } } } - return 0L; } -IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl ) +IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, void ) { - if (m_pFieldExpression && pControl == m_pGroupIntervalEd) + if (m_pFieldExpression && &rControl == m_pGroupIntervalEd) { if ( m_pGroupIntervalEd->IsModified() ) SaveData(m_pFieldExpression->GetCurRow()); } - return 0L; } IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index f3f74919b931..714191c2c887 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -82,8 +82,8 @@ class OGroupsSortingDialog : public FloatingWindow ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; bool m_bReadOnly; private: - DECL_LINK( OnControlFocusLost, Control* ); - DECL_LINK( OnControlFocusGot, Control* ); + DECL_LINK_TYPED( OnControlFocusLost, Control&, void ); + DECL_LINK_TYPED( OnControlFocusGot, Control&, void ); DECL_LINK( LBChangeHdl, ListBox* ); DECL_LINK_TYPED( OnFormatAction, ToolBox*, void ); |