diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-16 13:33:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
commit | bc9d5eb566137351969c58f907a2dc98273a6bf8 (patch) | |
tree | a319c8b981ac128efea4315c9469786168c15844 /svx/source/unodraw | |
parent | 7ffa2184586a2339f80f0af41c303dad9e822390 (diff) |
convert Link<> to typed
Change-Id: Ida49b6a482efa12703ce294b9665273ad2d8f68b
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 1ff2e0ec2825..3e9c39de0038 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -148,7 +148,7 @@ public: Point LogicToPixel( const Point&, const MapMode& rMapMode ); Point PixelToLogic( const Point&, const MapMode& rMapMode ); - DECL_LINK( NotifyHdl, EENotify* ); + DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); virtual void ObjectInDestruction(const SdrObject& rObject) SAL_OVERRIDE; @@ -435,7 +435,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // remove as listener - outliner might outlive ourselves if( mpView && mpView->GetTextEditOutliner() ) - mpView->GetTextEditOutliner()->SetNotifyHdl( Link<>() ); + mpView->GetTextEditOutliner()->SetNotifyHdl( Link<EENotify&,void>() ); // destroy view forwarder, OutlinerView no longer // valid (no need for UpdateData(), it's been @@ -1018,17 +1018,15 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r return Point(); } -IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify) +IMPL_LINK_TYPED(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void) { - if( aNotify && !mbNotificationsDisabled ) + if( !mbNotificationsDisabled ) { - std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); + std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) ); if( aHint.get() ) Broadcast( *aHint.get() ); } - - return 0; } SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText ) |