diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/app/sm.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 05dfc4003351..c0d5751495ef 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -1337,7 +1337,7 @@ void PrinterUpdate::update(SalGenericInstance &rInstance) { pPrinterUpdateIdle = new Idle(); pPrinterUpdateIdle->SetPriority( SchedulerPriority::LOWEST ); - pPrinterUpdateIdle->SetIdleHdl( STATIC_LINK( NULL, PrinterUpdate, UpdateTimerHdl ) ); + pPrinterUpdateIdle->SetIdleHdl( LINK( NULL, PrinterUpdate, UpdateTimerHdl ) ); pPrinterUpdateIdle->Start(); } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7859ccc370c4..ca3539306540 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -390,7 +390,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) void Application::Quit() { - Application::PostUserEvent( STATIC_LINK( NULL, ImplSVAppData, ImplQuitMsg ) ); + Application::PostUserEvent( LINK( NULL, ImplSVAppData, ImplQuitMsg ) ); } comphelper::SolarMutex& Application::GetSolarMutex() @@ -695,7 +695,7 @@ ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, Ke ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pKeyEvent ); nEventId = PostUserEvent( - STATIC_LINK( NULL, Application, PostEventHandler ), + LINK( NULL, Application, PostEventHandler ), pPostEventData ); if( nEventId ) @@ -728,7 +728,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent ); nEventId = PostUserEvent( - STATIC_LINK( NULL, Application, PostEventHandler ), + LINK( NULL, Application, PostEventHandler ), pPostEventData ); if( nEventId ) @@ -762,7 +762,7 @@ ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, Z ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent ); nEventId = PostUserEvent( - STATIC_LINK( NULL, Application, PostEventHandler ), + LINK( NULL, Application, PostEventHandler ), pPostEventData ); if( nEventId ) @@ -787,7 +787,7 @@ ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pScrollEvent ); nEventId = PostUserEvent( - STATIC_LINK( NULL, Application, PostEventHandler ), + LINK( NULL, Application, PostEventHandler ), pPostEventData ); if( nEventId ) diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 750b8b79f867..96107dcacf54 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -341,7 +341,7 @@ void SessionManagerClient::SaveYourselfProc( } // Smuggle argument in as void*: sal_uIntPtr nStateVal = shutdown; - Application::PostUserEvent( STATIC_LINK( 0, SessionManagerClient, SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) ); + Application::PostUserEvent( LINK( 0, SessionManagerClient, SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) ); SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } @@ -368,7 +368,7 @@ void SessionManagerClient::DieProc( SAL_INFO("vcl.sm", "Session: die"); if( connection == m_pSmcConnection ) { - Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, ShutDownHdl ) ); + Application::PostUserEvent( LINK( NULL, SessionManagerClient, ShutDownHdl ) ); SAL_INFO("vcl.sm", "waiting for shutdown event to be processed" ); } } @@ -387,7 +387,7 @@ void SessionManagerClient::ShutdownCanceledProc( { SAL_INFO("vcl.sm", "Session: shutdown canceled" ); if( connection == m_pSmcConnection ) - Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, ShutDownCancelHdl ) ); + Application::PostUserEvent( LINK( NULL, SessionManagerClient, ShutDownCancelHdl ) ); } void SessionManagerClient::InteractProc( @@ -396,7 +396,7 @@ void SessionManagerClient::InteractProc( { SAL_INFO("vcl.sm", "Session: interaction request completed" ); if( connection == m_pSmcConnection ) - Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, InteractionHdl ) ); + Application::PostUserEvent( LINK( NULL, SessionManagerClient, InteractionHdl ) ); } void SessionManagerClient::saveDone() |