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 /sd | |
| parent | 7ffa2184586a2339f80f0af41c303dad9e822390 (diff) | |
convert Link<> to typed
Change-Id: Ida49b6a482efa12703ce294b9665273ad2d8f68b
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 19 | ||||
| -rw-r--r-- | sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 7528ccb19b68..0076ce93553f 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -48,7 +48,7 @@ namespace accessibility AccessibleOutlineEditSource::~AccessibleOutlineEditSource() { if( mpOutliner ) - mpOutliner->SetNotifyHdl( Link<>() ); + mpOutliner->SetNotifyHdl( Link<EENotify&,void>() ); Broadcast( TextHint( SFX_HINT_DYING ) ); } @@ -196,24 +196,21 @@ namespace accessibility if( bDispose ) { if( mpOutliner ) - mpOutliner->SetNotifyHdl( Link<>() ); + mpOutliner->SetNotifyHdl( Link<EENotify&,void>() ); mpOutliner = NULL; mpOutlinerView = NULL; Broadcast( TextHint( SFX_HINT_DYING ) ); } } - IMPL_LINK(AccessibleOutlineEditSource, NotifyHdl, EENotify*, aNotify) + IMPL_LINK_TYPED(AccessibleOutlineEditSource, NotifyHdl, EENotify&, rNotify, void) { - if( aNotify ) - { - ::std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); - - if( aHint.get() ) - Broadcast( *aHint.get() ); - } + ::std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) ); - return 0; + if( aHint.get() ) + { + Broadcast( *aHint.get() ); + } } } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index e4a35bdeded2..72b9b8a534b4 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -76,7 +76,7 @@ namespace accessibility AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION; AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION; - DECL_LINK( NotifyHdl, EENotify* ); + DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); SdrView& mrView; const vcl::Window& mrWindow; |