diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:52 +0200 |
| commit | 1e67e94f1a308ca60d4934e9fe9d5c048225ebe8 (patch) | |
| tree | c3bdf0fcec6912bc84e835fe48a80ee9f9391106 /sc | |
| parent | c916152d8562cab868d4c522748ac30029fad179 (diff) | |
convert Link<> to typed
Change-Id: If3e2b00092440ebd42ae5b73ae2b0e44c3702683
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 36 | ||||
| -rw-r--r-- | sc/source/ui/inc/AccessibleDocument.hxx | 2 |
2 files changed, 16 insertions, 22 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f94d6b2261df..9fe0208b6196 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1483,36 +1483,30 @@ void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Sourc //===== SfxListener ===================================================== -IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEvent ) +IMPL_LINK_TYPED( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEvent, void ) { - OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); - if ( pEvent && pEvent->ISA( VclWindowEvent ) ) + OSL_ENSURE( rEvent.GetWindow(), "Window???" ); + switch ( rEvent.GetId() ) { - VclWindowEvent *pVclEvent = static_cast< VclWindowEvent * >( pEvent ); - OSL_ENSURE( pVclEvent->GetWindow(), "Window???" ); - switch ( pVclEvent->GetId() ) + case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); + if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { - vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); - if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) - { - AddChild( pChildWin->GetAccessible(), true ); - } + AddChild( pChildWin->GetAccessible(), true ); } - break; - case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + } + break; + case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + { + vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); + if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { - vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); - if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) - { - RemoveChild( pChildWin->GetAccessible(), true ); - } + RemoveChild( pChildWin->GetAccessible(), true ); } - break; } + break; } - return 0; } void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 3e1d94f3cafc..ff153b023eb4 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -65,7 +65,7 @@ public: virtual void Init() SAL_OVERRIDE; - DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); protected: virtual ~ScAccessibleDocument(); |