diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 09:51:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
| commit | b98fb89598a400b33a47ceebafe1604c03c829dc (patch) | |
| tree | dd465013d9f77ea14b6e77a81b7cf88dd2f4a88e /starmath | |
| parent | 23b9febbd883f9db77ffb0216b050aaabc4c6510 (diff) | |
convert Link<> to typed
Change-Id: Ied8e0b35f193770a6651f1c57dfb8eedd22d837c
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/accessibility.cxx | 17 | ||||
| -rw-r--r-- | starmath/source/accessibility.hxx | 2 |
2 files changed, 7 insertions, 12 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index fbae1df88f16..7831b1591926 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -941,19 +941,14 @@ SmTextForwarder::~SmTextForwarder() { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) - pEditEngine->SetNotifyHdl( Link<>() ); + pEditEngine->SetNotifyHdl( Link<EENotify&,void>() ); } -IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify*, aNotify) +IMPL_LINK_TYPED(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void) { - if (aNotify) - { - ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify ); - if (aHint.get()) - rEditSource.GetBroadcaster().Broadcast( *aHint.get() ); - } - - return 0; + ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify ); + if (aHint.get()) + rEditSource.GetBroadcaster().Broadcast( *aHint.get() ); } sal_Int32 SmTextForwarder::GetParagraphCount() const @@ -1640,7 +1635,7 @@ void SmEditAccessible::ClearWin() // (avoid handler being called for already dead object) EditEngine *pEditEngine = GetEditEngine(); if (pEditEngine) - pEditEngine->SetNotifyHdl( Link<>() ); + pEditEngine->SetNotifyHdl( Link<EENotify&,void>() ); pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 98cdc602d9ce..d547f8b0c7c2 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -182,7 +182,7 @@ class SmTextForwarder : /* analog to SvxEditEngineForwarder */ SmEditAccessible & rEditAcc; SmEditSource & rEditSource; - DECL_LINK( NotifyHdl, EENotify * ); + DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); SmTextForwarder( const SmTextForwarder & ) SAL_DELETED_FUNCTION; SmTextForwarder & operator = ( const SmTextForwarder & ) SAL_DELETED_FUNCTION; |