diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-10 16:44:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-11 08:48:55 +0200 |
| commit | 71a83295d8c719f4fd4fa05f367c3c85323e22e9 (patch) | |
| tree | 1ff99c92e49ad61e7b478daad338fd6109324222 /accessibility | |
| parent | c80fb09256f02379b78f7bb219e94dfbf5277872 (diff) | |
convert Link<> to typed
and remove unused maChildEventListeners
Change-Id: I845a9af608c3429cf9ccb0e8041f24f423839513
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx | 2 | ||||
| -rw-r--r-- | accessibility/source/standard/accessiblemenubasecomponent.cxx | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index a16a974528f6..e7547e182264 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -112,7 +112,7 @@ protected: virtual void Click(); virtual bool IsPopupMenuOpen(); - DECL_LINK( MenuEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ); diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 47312f7fa914..26a62b52b221 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -566,15 +566,10 @@ bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() -IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEvent ) +IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) { - OSL_ENSURE( pEvent && pEvent->ISA( VclMenuEvent ), "OAccessibleMenuBaseComponent - Unknown MenuEvent!" ); - if ( pEvent && pEvent->ISA( VclMenuEvent ) ) - { - OSL_ENSURE( static_cast<VclMenuEvent*>(pEvent)->GetMenu(), "OAccessibleMenuBaseComponent - Menu?" ); - ProcessMenuEvent( *static_cast<VclMenuEvent*>(pEvent) ); - } - return 0; + OSL_ENSURE( rEvent.GetMenu(), "OAccessibleMenuBaseComponent - Menu?" ); + ProcessMenuEvent( rEvent ); } |