diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 22:43:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 08:20:55 +0200 |
| commit | b515d1f36fdf8c242079da60eb4ecd5fd456583c (patch) | |
| tree | f26dd6feb936ddec4799bed60d4966d46acff938 /reportdesign/source/ui/dlg | |
| parent | SfxBoolItem takes a sal_uInt16 nWhich as first argument (diff) | |
| download | core-b515d1f36fdf8c242079da60eb4ecd5fd456583c.tar.gz core-b515d1f36fdf8c242079da60eb4ecd5fd456583c.zip | |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'reportdesign/source/ui/dlg')
| -rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 7 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 6ba139216869..7924a17dd102 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -526,7 +526,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff) } } -IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSortAction, ToolBox*, void ) { const sal_uInt16 nCurItem = m_aActions->GetCurItemId(); if ( SID_ADD_CONTROL_PAIR == nCurItem ) @@ -559,7 +559,6 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) m_pListBox->GetModel()->Resort(); } } - return 0L; } diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 049ae98da0f1..0339327b5b70 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -334,7 +334,7 @@ void Condition::dispose() VclHBox::dispose(); } -IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) +IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void ) { sal_uInt16 nId( m_pActions->GetCurItemId() ); if ( !m_pColorFloat ) @@ -355,15 +355,12 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) m_pColorFloat->SetPosPixel(m_pActions->GetItemPopupPosition(nId,m_pColorFloat->GetSizePixel())); m_pColorFloat->StartPopupMode(m_pActions); m_pColorFloat->StartSelection(); - - return 1; } -IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG_TYPED( Condition, OnFormatAction, ToolBox*, void ) { Color aCol(COL_AUTO); ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol); - return 0L; } IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 506cba302f4f..bd2f64036b88 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -100,8 +100,8 @@ namespace rptui ConditionalExpressions m_aConditionalExpressions; - DECL_LINK( OnFormatAction, ToolBox* ); - DECL_LINK( DropdownClick, ToolBox* ); + DECL_LINK_TYPED( OnFormatAction, ToolBox*, void ); + DECL_LINK_TYPED( DropdownClick, ToolBox*, void ); DECL_LINK( OnConditionAction, Button* ); public: diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index efd047adf125..52006da08acd 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1152,7 +1152,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl ) return 0L; } -IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) { sal_uInt16 nCommand = m_pToolBox->GetCurItemId(); @@ -1192,7 +1192,6 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) } } } - return 1L; } IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox ) |