diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-17 13:03:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 14:41:58 +0200 |
| commit | c629064294a76f212b6104713765f0c06ccf2e12 (patch) | |
| tree | 12589c4b0c779b7f47c765f3338fc91043f9a14d /sd | |
| parent | 2d9e314c0925a73f6bc876e06d798184ed028416 (diff) | |
convert Link<> to typed
Change-Id: I91bef82236613435fadc8fed48f37f3606f5466a
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index ab3a154721f9..de878b01b353 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -73,14 +73,14 @@ public: sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); - void SetDoubleClickLink( const Link<>& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } + void SetDoubleClickLink( const Link<CategoryListBox&,void>& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } DECL_LINK_TYPED(implDoubleClickHdl, ListBox&, void); private: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - Link<> maDoubleClickHdl; + Link<CategoryListBox&,void> maDoubleClickHdl; }; CategoryListBox::CategoryListBox( vcl::Window* pParent ) @@ -148,7 +148,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) ) { if( maDoubleClickHdl.IsSet() ) - maDoubleClickHdl.Call( this ); + maDoubleClickHdl.Call( *this ); } else { @@ -177,7 +177,7 @@ public: private: DECL_LINK( implSelectHdl, Control* ); - DECL_LINK( implDoubleClickHdl, Control* ); + DECL_LINK_TYPED( implDoubleClickHdl, CategoryListBox&, void ); void onSelectEffect(); @@ -314,14 +314,13 @@ IMPL_LINK( CustomAnimationCreateTabPage, implSelectHdl, Control*, pControl ) return 0; } -IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl ) +IMPL_LINK_TYPED( CustomAnimationCreateTabPage, implDoubleClickHdl, CategoryListBox&, rControl, void ) { - if( pControl == mpLBEffects ) + if( &rControl == mpLBEffects ) { if( mpLBEffects->GetSelectEntryCount() ) mpParent->EndDialog( RET_OK ); } - return 0; } void CustomAnimationCreateTabPage::onSelectEffect() |