diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-07 13:48:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
| commit | 8d927d3f82a33a464662e4b54a8a07d30d4d1a19 (patch) | |
| tree | d65da75b786634550eb1e7fa4b1859d63e968dfe /reportdesign/source | |
| parent | 61623d5b90510ae6c791a41031d586a9316e74c4 (diff) | |
convert Link<> to typed
Change-Id: Ia2706c308c6297d05b2862e9f86fc0f2ee90e4f0
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index d5b04a130688..bf7e664bd519 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -95,9 +95,9 @@ IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void ) #define PALETTE_SIZE (PALETTE_X * PALETTE_Y) class OColorPopup : public FloatingWindow { - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); VclPtr<Condition> m_pCondition; - sal_uInt16 m_nSlotId; + sal_uInt16 m_nSlotId; public: OColorPopup(vcl::Window* _pParent,Condition* _pCondition); virtual ~OColorPopup(); @@ -194,7 +194,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) } } -IMPL_LINK_NOARG(OColorPopup, SelectHdl) +IMPL_LINK_NOARG_TYPED(OColorPopup, SelectHdl, ValueSet*, void) { sal_uInt16 nItemId = m_aColorSet->GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet->GetItemColor( nItemId ) ); @@ -208,7 +208,6 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl) EndPopupMode(); m_pCondition->ApplyCommand( m_nSlotId, aColor ); - return 0; } |