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 /framework | |
| parent | c916152d8562cab868d4c522748ac30029fad179 (diff) | |
convert Link<> to typed
Change-Id: If3e2b00092440ebd42ae5b73ae2b0e44c3702683
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 23 |
2 files changed, 9 insertions, 16 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index c8b4e7c37a91..76d958e97cde 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -169,7 +169,7 @@ namespace framework virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LINK_TYPED( MenuBarClose, void *, void); - DECL_LINK( WindowEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); // ILayoutNotifications diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index f27f528dd454..4b4b645b440b 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1398,25 +1398,18 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( cons return xUIElement; } -IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) +IMPL_LINK_TYPED( LayoutManager, WindowEventListener, VclWindowEvent&, rEvent, void ) { - long nResult( 1 ); - - if ( pEvent && pEvent->ISA( VclWindowEvent )) + vcl::Window* pWindow = rEvent.GetWindow(); + if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { - vcl::Window* pWindow = static_cast< VclWindowEvent* >(pEvent)->GetWindow(); - if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) - { - SolarMutexClearableGuard aReadLock; - ToolbarLayoutManager* pToolbarManager( m_pToolbarManager ); - aReadLock.clear(); + SolarMutexClearableGuard aReadLock; + ToolbarLayoutManager* pToolbarManager( m_pToolbarManager ); + aReadLock.clear(); - if ( pToolbarManager ) - nResult = pToolbarManager->childWindowEvent( pEvent ); - } + if ( pToolbarManager ) + pToolbarManager->childWindowEvent( &rEvent ); } - - return nResult; } void SAL_CALL LayoutManager::createElement( const OUString& aName ) |